From 2b73bf1ed197ddf3c1ff04dd3bd64556a870bc16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20J=2E=20Est=C3=A9banez?= Date: Sat, 27 Aug 2022 13:01:24 +0200 Subject: Make local-to-scene resources behavior consistent in child scenes --- scene/resources/packed_scene.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scene') diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp index dcccc6898b..71bfb01de3 100644 --- a/scene/resources/packed_scene.cpp +++ b/scene/resources/packed_scene.cpp @@ -297,7 +297,7 @@ Node *SceneState::instantiate(GenEditState p_edit_state) const { if (E) { value = E->value; } else { - if (p_edit_state == GEN_EDIT_STATE_MAIN || p_edit_state == GEN_EDIT_STATE_MAIN_INHERITED) { + 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; -- cgit v1.2.3