Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-06 23:31:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed resource setup handling

Browse Source
This commit is contained in:
AndreaCatania
2018-01-11 19:26:28 +01:00
parent efe27c6ed2
commit b77968dea3
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scene/resources/packed_scene.cpp
View File

@@ -235,6 +235,7 @@ Node *SceneState::instance(GenEditState p_edit_state) const {
if (p_edit_state == GEN_EDIT_STATE_MAIN) { if (p_edit_state == GEN_EDIT_STATE_MAIN) {
//for the main scene, use the resource as is //for the main scene, use the resource as is
res->configure_for_local_scene(base, resources_local_to_scene); res->configure_for_local_scene(base, resources_local_to_scene);
resources_local_to_scene[res] = res;
} else { } else {
//for instances, a copy must be made //for instances, a copy must be made
@@ -244,9 +245,6 @@ Node *SceneState::instance(GenEditState p_edit_state) const {
res = local_dupe; res = local_dupe;
value = 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 //must make a copy, because this res is local to scene
} }