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

Merge pull request #109903 from aaronfranke/abstract-rugpull

Browse Source 
Allow extending previously-non-abstract scripts that became abstract
This commit is contained in:
Thaddeus Crews
2025-08-27 13:39:42 -05:00
parent b86d05e7f8 84eb90b790
commit d7c4773e7b
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
scene/resources/packed_scene.cpp
View File

@@ -347,7 +347,24 @@ Node *SceneState::instantiate(GenEditState p_edit_state) const {
node->get_script_instance()->get_property_state(old_state); node->get_script_instance()->get_property_state(old_state);
} }
node->set(snames[nprops[j].name], props[nprops[j].value], &valid); #ifdef TOOLS_ENABLED
const Ref<Script> value_as_script = props[nprops[j].value];
// It is possible that the user changed an existing script to abstract after it was attached to a node.
// When this happens, the user needs to fix it. See https://github.com/godotengine/godot/issues/109171
if (value_as_script.is_valid() && value_as_script->is_abstract()) {
const String global_class_name = value_as_script->get_global_name();
if (global_class_name.is_empty()) {
ERR_PRINT("Node \"" + snames[n.name] + "\" previously had a script, but that script is now abstract. Please assign a different script (right-click -> Attach Script...) or change the node to a different type (right-click -> Change Type...) to fix this, then re-save the scene.");
} else {
ERR_PRINT("Node \"" + snames[n.name] + "\" previously had a class of type \"" + global_class_name + "\", but that class is now abstract. Please assign a different script (right-click -> Attach Script...) or change the node to a different type (right-click -> Change Type...) to fix this, then re-save the scene.");
}
callable_mp((Object *)node, &Object::remove_meta).call_deferred(SceneStringName(_custom_type_script));
} else {
node->set_script(props[nprops[j].value]);
}
#else
node->set_script(props[nprops[j].value]);
#endif // TOOLS_ENABLED
//restore old state for new script, if exists //restore old state for new script, if exists
for (const Pair<StringName, Variant> &E : old_state) { for (const Pair<StringName, Variant> &E : old_state) {