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

Merge pull request #34106 from KoBeWi/convoluted_ownership

Browse source 
Don't store index of root nodes
This commit is contained in:
Rémi Verschelde 2019-12-05 21:38:44 +01:00 committed by GitHub
commit ce02725cc1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scene/resources/packed_scene.cpp
View file

@ -397,6 +397,9 @@ Error SceneState::_parse_node(Node *p_owner, Node *p_node, int p_parent_idx, Map
if (p_owner->get_scene_inherited_state().is_null() && (p_node == p_owner || (p_node->get_owner() == p_owner && (p_node->get_parent() == p_owner || p_node->get_parent()->get_owner() == p_owner)))) { if (p_owner->get_scene_inherited_state().is_null() && (p_node == p_owner || (p_node->get_owner() == p_owner && (p_node->get_parent() == p_owner || p_node->get_parent()->get_owner() == p_owner)))) {
//do not save index, because it belongs to saved scene and scene is not inherited //do not save index, because it belongs to saved scene and scene is not inherited
nd.index = -1; nd.index = -1;
} else if (p_node == p_owner) {
//This (hopefully) happens if the node is a scene root, so its index is irrelevant.
nd.index = -1;
} else { } else {
//part of an inherited scene, or parent is from an instanced scene //part of an inherited scene, or parent is from an instanced scene
nd.index = p_node->get_index(); nd.index = p_node->get_index();