diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-08-28 21:17:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-28 21:17:39 +0200 |
| commit | 82663e7eb01decc694a249ffdbd27fad8a67d027 (patch) | |
| tree | ad19db3c89ce91b78c81a483123fb952aed29337 | |
| parent | 006915b4824a91c0e0fc95ac6aa2f70908a0a027 (diff) | |
| parent | 2b73bf1ed197ddf3c1ff04dd3bd64556a870bc16 (diff) | |
Merge pull request #64957 from RandomShaper/subscene_edit_state
| -rw-r--r-- | scene/resources/packed_scene.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; |