浏览代码

Make local-to-scene resources behavior consistent in child scenes

Pedro J. Estébanez 3 年之前
父节点
当前提交
2b73bf1ed1
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      scene/resources/packed_scene.cpp

+ 1 - 1
scene/resources/packed_scene.cpp

@@ -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;