Sara/this-city
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: updated engine

Browse source
This commit is contained in:
Sara Gerretsen 2026-07-10 17:04:34 +02:00
parent cbe99774ff
commit f4cf6b3999
6607 changed files with 910135 additions and 430025 deletions
Download patch file Download diff file Expand all files Collapse all files

39
engine/editor/inspector/multi_node_edit.cpp
View file

@ -31,8 +31,11 @@
#include "multi_node_edit.h"
#include "core/math/math_fieldwise.h"
#include "core/object/callable_mp.h"
#include "core/object/class_db.h"
#include "editor/editor_node.h"
#include "editor/editor_undo_redo_manager.h"
#include "scene/property_utils.h"
bool MultiNodeEdit::_set(const StringName &p_name, const Variant &p_value) {
return _set_impl(p_name, p_value, "");
@ -186,8 +189,27 @@ void MultiNodeEdit::_get_property_list(List<PropertyInfo> *p_list) const {
data_list.push_back(usage_data);
}
// Make sure only properties with the same exact PropertyInfo data will appear.
if (usage_data->info == F) {
// Make sure only properties with matching PropertyInfo data will appear.
if (usage_data->info.name == F.name &&
usage_data->info.type == F.type &&
usage_data->info.class_name == F.class_name &&
usage_data->info.hint == F.hint &&
usage_data->info.hint_string == F.hint_string) {
if (usage_data->info.usage != F.usage) {
// Checkable properties (mostly theme items) need special treatment.
if (usage_data->info.usage & PROPERTY_USAGE_CHECKABLE && F.usage & PROPERTY_USAGE_CHECKABLE) {
if (usage_data->info.usage & PROPERTY_USAGE_CHECKED) {
F.usage |= PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_CHECKED;
} else {
F.usage &= ~(PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_CHECKED);
}
if (usage_data->info.usage != F.usage) {
continue;
}
}
}
usage_data->uses++;
}
}
@ -201,7 +223,7 @@ void MultiNodeEdit::_get_property_list(List<PropertyInfo> *p_list) const {
}
}
p_list->push_back(PropertyInfo(Variant::OBJECT, "scripts", PROPERTY_HINT_RESOURCE_TYPE, "Script"));
p_list->push_back(PropertyInfo(Variant::OBJECT, "scripts", PROPERTY_HINT_RESOURCE_TYPE, Script::get_class_static()));
}
String MultiNodeEdit::_get_editor_name() const {
@ -241,7 +263,16 @@ bool MultiNodeEdit::_property_get_revert(const StringName &p_name, Variant &r_pr
continue;
}
r_property = ClassDB::class_get_default_property_value(node->get_class_name(), p_name);
// Check if property can revert before using class default.
if (node->property_can_revert(p_name)) {
r_property = node->property_get_revert(p_name);
} else {
bool is_valid = false;
r_property = PropertyUtils::get_property_default_value(node, p_name, &is_valid);
if (!is_valid) {
r_property = ClassDB::class_get_default_property_value(node->get_class_name(), p_name);
}
}
return true;
}