summaryrefslogtreecommitdiff
path: root/scene/resources
diff options
context:
space:
mode:
authorAndreaCatania <info@andreacatania.com>2018-01-11 19:26:28 +0100
committerAndreaCatania <info@andreacatania.com>2018-01-11 19:26:28 +0100
commitb77968dea3b05e75fe2ad74f243bce9051a9968e (patch)
tree0bb903922962f59cb43aa45c151911da4eb785ac /scene/resources
parentefe27c6ed243bfa559a94be957c479d8e1025ba2 (diff)
Fixed resource setup handling
Diffstat (limited to 'scene/resources')
-rw-r--r--scene/resources/packed_scene.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp
index c13a72698b..dd8d0e2141 100644
--- a/scene/resources/packed_scene.cpp
+++ b/scene/resources/packed_scene.cpp
@@ -235,6 +235,7 @@ Node *SceneState::instance(GenEditState p_edit_state) const {
if (p_edit_state == GEN_EDIT_STATE_MAIN) {
//for the main scene, use the resource as is
res->configure_for_local_scene(base, resources_local_to_scene);
+ resources_local_to_scene[res] = res;
} else {
//for instances, a copy must be made
@@ -244,9 +245,6 @@ Node *SceneState::instance(GenEditState p_edit_state) const {
res = local_dupe;
value = local_dupe;
}
-
- //this here may reference nodes not iniialized so this line is commented and used after loading all nodes
- //res->setup_local_to_scene();
}
//must make a copy, because this res is local to scene
}