godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash when loading a scene containing an uncreatable type

Browse Source 
(cherry picked from commit 04a4828c5e)
This commit is contained in:
Delf Neumärker 2021-02-25 23:58:15 +01:00 committed by Rémi Verschelde
parent bdf335d369
commit 28e36dc7b9
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scene/resources/packed_scene.cpp
View File

@ -152,15 +152,20 @@ Node *SceneState::instance(GenEditState p_edit_state) const {
} }
#endif #endif
} }
} else if (ClassDB::is_class_enabled(snames[n.type])) { } else {
//node belongs to this scene and must be created Object *obj = nullptr;
Object *obj = ClassDB::instance(snames[n.type]);
if (ClassDB::is_class_enabled(snames[n.type])) {
//node belongs to this scene and must be created
obj = ClassDB::instance(snames[n.type]);
}
if (!Object::cast_to<Node>(obj)) { if (!Object::cast_to<Node>(obj)) {
if (obj) { if (obj) {
memdelete(obj); memdelete(obj);
obj = NULL; obj = NULL;
} }
WARN_PRINT(String("Warning node of type " + snames[n.type].operator String() + " does not exist.").ascii().get_data()); WARN_PRINT(vformat("Node %s of type %s cannot be created. A placeholder will be created instead.", snames[n.name], snames[n.type]).ascii().get_data());
if (n.parent >= 0 && n.parent < nc && ret_nodes[n.parent]) { if (n.parent >= 0 && n.parent < nc && ret_nodes[n.parent]) {
if (Object::cast_to<Spatial>(ret_nodes[n.parent])) { if (Object::cast_to<Spatial>(ret_nodes[n.parent])) {
obj = memnew(Spatial); obj = memnew(Spatial);
@ -177,10 +182,6 @@ Node *SceneState::instance(GenEditState p_edit_state) const {
} }
node = Object::cast_to<Node>(obj); node = Object::cast_to<Node>(obj);
} else {
//print_line("Class is disabled for: " + itos(n.type));
//print_line("name: " + String(snames[n.type]));
} }
if (node) { if (node) {