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

Merge pull request #53450 from nekomatata/fix-editable-children-error

Browse source
This commit is contained in:
Rémi Verschelde 2021-10-06 08:27:15 +02:00 committed by GitHub
commit aa02e0b151
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scene/resources/packed_scene.cpp
View file

@ -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)); editable_instances.push_back(p_owner->get_path_to(p_node));
// Node is the root of an editable instance. // Node is the root of an editable instance.
is_editable_instance = true; 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. // Node is part of an editable instance.
is_editable_instance = true; is_editable_instance = true;
} }