asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #15528 from AndreaCatania/p1

Browse source 
Fixed viewport node error on editor
This commit is contained in:
Rémi Verschelde 2018-01-11 22:19:02 +01:00 committed by GitHub
commit e6edbc7699
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scene/resources/packed_scene.cpp
View file

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