godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #105148 from salianifo/contrib-upstream

Browse Source 
Fix exported Node/Resource variables resetting when extending script in the SceneTreeDock
This commit is contained in:
Thaddeus Crews
2025-04-15 12:28:42 -05:00
parent e508573183 ee6c321fe6
commit e8b703a80e
1 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
editor/inspector_dock.cpp
View File

@@ -646,10 +646,40 @@ void InspectorDock::apply_script_properties(Object *p_object) {
return;
}
List<PropertyInfo> properties;
si->get_property_list(&properties);
for (const Pair<StringName, Variant> &E : stored_properties) {
Variant current_prop;
if (si->get(E.first, current_prop) && current_prop.get_type() == E.second.get_type()) {
si->set(E.first, E.second);
} else if (E.second.get_type() == Variant::OBJECT) {
for (const PropertyInfo &pi : properties) {
if (E.first != pi.name) {
continue;
}
if (pi.type != Variant::OBJECT) {
break;
}
Object *p_property_object = E.second;
if (p_property_object->is_class(pi.hint_string)) {
si->set(E.first, E.second);
break;
}
Ref<Script> base_script = p_property_object->get_script();
while (base_script.is_valid()) {
if (base_script->get_global_name() == pi.hint_string) {
si->set(E.first, E.second);
break;
}
base_script = base_script->get_base_script();
}
break;
}
}
}
stored_properties.clear();