diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-10-06 08:27:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-06 08:27:15 +0200 |
| commit | aa02e0b1515575a3c4e8c1f927d6e4548aed6cd4 (patch) | |
| tree | 0a39726316f5f622a98d52f2b9e16b389b400d86 /scene/resources | |
| parent | 9962c59dc518ed62b9e471752e621bb73af97211 (diff) | |
| parent | 2f6cf3b8a8e81fe2cde0df026a66f46d4b498c51 (diff) | |
Merge pull request #53450 from nekomatata/fix-editable-children-error
Diffstat (limited to 'scene/resources')
| -rw-r--r-- | scene/resources/packed_scene.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp index c8d3ea5e37..60cda637ca 100644 --- a/scene/resources/packed_scene.cpp +++ b/scene/resources/packed_scene.cpp @@ -388,7 +388,7 @@ Error SceneState::_parse_node(Node *p_owner, Node *p_node, int p_parent_idx, Map editable_instances.push_back(p_owner->get_path_to(p_node)); // Node is the root of an editable instance. is_editable_instance = true; - } else if (p_node->get_owner() && p_node->get_owner() != p_owner && p_owner->is_editable_instance(p_node->get_owner())) { + } else if (p_node->get_owner() && p_owner->is_ancestor_of(p_node->get_owner()) && p_owner->is_editable_instance(p_node->get_owner())) { // Node is part of an editable instance. is_editable_instance = true; } |