diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-12-05 21:38:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-05 21:38:44 +0100 |
| commit | ce02725cc124bccc3ee44ddb0c28f2b968f48ba5 (patch) | |
| tree | 48caa387417b96241c6cd8cc5e7610db5dc8b799 /scene/resources | |
| parent | 9002b045c696416b9b09bb708018c7929507d41d (diff) | |
| parent | 3b80eb06b744c8a374970cd87819f98a81d8b9ba (diff) | |
Merge pull request #34106 from KoBeWi/convoluted_ownership
Don't store index of root nodes
Diffstat (limited to 'scene/resources')
| -rw-r--r-- | scene/resources/packed_scene.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp index 7d62873bbd..5ce269fff9 100644 --- a/scene/resources/packed_scene.cpp +++ b/scene/resources/packed_scene.cpp @@ -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)))) { //do not save index, because it belongs to saved scene and scene is not inherited 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 { //part of an inherited scene, or parent is from an instanced scene nd.index = p_node->get_index(); |