noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #46510 from hilfazer/nested_scene_duplication_4_0

Browse Source 
Support for duplication of nested instanced scenes
This commit is contained in:
Rémi Verschelde
2021-03-11 21:39:43 +01:00
committed by GitHub
parent 5024b7236e 72134a7f2a
commit 27dea9366f
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scene/main/node.cpp
+9 -2
View File
@@ -2051,19 +2051,26 @@ Node *Node::_duplicate(int p_flags, Map<const Node *, Node *> *r_duplimap) const
// Since nodes in the instanced hierarchy won't be duplicated explicitly, we need to make an inventory
// of all the nodes in the tree of the instanced scene in order to transfer the values of the properties
Vector<const Node *> instance_roots;
instance_roots.push_back(this);
for (List<const Node *>::Element *N = node_tree.front(); N; N = N->next()) {
for (int i = 0; i < N->get()->get_child_count(); ++i) {
Node *descendant = N->get()->get_child(i);
// Skip nodes not really belonging to the instanced hierarchy; they'll be processed normally later
// but remember non-instanced nodes that are hidden below instanced ones
if (descendant->data.owner != this) {
if (descendant->get_parent() && descendant->get_parent() != this && descendant->get_parent()->data.owner == this && descendant->data.owner != descendant->get_parent()) {
if (!instance_roots.has(descendant->get_owner())) {
if (descendant->get_parent() && descendant->get_parent() != this && descendant->data.owner != descendant->get_parent()) {
hidden_roots.push_back(descendant);
}
continue;
}
node_tree.push_back(descendant);
if (descendant->get_filename() != "" && instance_roots.has(descendant->get_owner())) {
instance_roots.push_back(descendant);
}
}
}
}