summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlaria Cislaghi <ilaria.cislaghi@simedis.com>2019-03-01 14:17:24 +0100
committerIlaria Cislaghi <ilaria.cislaghi@simedis.com>2019-03-01 14:38:02 +0100
commit9d41ee71f6caf0ce9ae1778f5bb6701dfc2f95bb (patch)
tree56e754069b34b4b1578d602e7ff5c4f3951941a9
parent482dcf526653299a068741baad91965f83506ac1 (diff)
Editor does not crash anymore if a non root node in escn is missing a parent
-rw-r--r--scene/resources/packed_scene.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp
index 0d12d388ef..99440ff202 100644
--- a/scene/resources/packed_scene.cpp
+++ b/scene/resources/packed_scene.cpp
@@ -92,6 +92,8 @@ Node *SceneState::instance(GenEditState p_edit_state) const {
if (i > 0) {
+ ERR_EXPLAIN(vformat("Invalid scene: node %s does not specify its parent node.", snames[n.name]))
+ ERR_FAIL_COND_V(n.parent == -1, NULL)
NODE_FROM_ID(nparent, n.parent);
#ifdef DEBUG_ENABLED
if (!nparent && (n.parent & FLAG_ID_IS_PATH)) {