godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #64957 from RandomShaper/subscene_edit_state

This commit is contained in:
Rémi Verschelde 2022-08-28 21:17:39 +02:00 committed by GitHub
parent 006915b482 2b73bf1ed1
commit 82663e7eb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scene/resources/packed_scene.cpp
View File

@ -297,7 +297,7 @@ Node *SceneState::instantiate(GenEditState p_edit_state) const {
if (E) { if (E) {
value = E->value; value = E->value;
} else { } 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 //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; resources_local_to_scene[res] = res;