浏览代码

Merge pull request #15528 from AndreaCatania/p1

Fixed viewport node error on editor
Rémi Verschelde 7 年之前
父节点
当前提交
e6edbc7699
共有 1 个文件被更改,包括 1 次插入3 次删除
  1. 1 3
      scene/resources/packed_scene.cpp

+ 1 - 3
scene/resources/packed_scene.cpp

@@ -235,6 +235,7 @@ Node *SceneState::instance(GenEditState p_edit_state) const {
 										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;
 
 										} else {
 											//for instances, a copy must be made
@@ -244,9 +245,6 @@ Node *SceneState::instance(GenEditState p_edit_state) const {
 											res = 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
 								}