Gremlinsoft
/
godot
forked from sascha/godot
2
0
Fork 0
Code Pull Requests Activity

Merge pull request #52775 from gyroninja/fix-instantiated-root-node-crash 

Fail at instantiating a packed scene if the root node is instantiated
4.0
Rémi Verschelde 2021-09-21 14:23:54 +07:00 committed by GitHub
parent 82c12060b2 f400c9239e
commit dc2b062609
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scene/resources/packed_scene.cpp
Unescape Escape View File

@ -99,8 +99,9 @@ Node *SceneState::instantiate(GenEditState p_edit_state) const {
#endif
parent = nparent;
} else {
// i == 0 is root node. Confirm that it doesn't have a parent defined.
// i == 0 is root node.
ERR_FAIL_COND_V_MSG(n.parent != -1, nullptr, vformat("Invalid scene: root node %s cannot specify a parent node.", snames[n.name]));
ERR_FAIL_COND_V_MSG(n.type == TYPE_INSTANCED && base_scene_idx < 0, nullptr, vformat("Invalid scene: root node %s in an instance, but there's no base scene.", snames[n.name]));
}
Node *node = nullptr;