diff options
| author | Max Hilbrunner <mhilbrunner@users.noreply.github.com> | 2018-07-03 18:48:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-03 18:48:45 +0200 |
| commit | 465edbd2bc218cde1b4f90ac77f8ae4b817b4f26 (patch) | |
| tree | 8b64132a9e5b2e765e97a1d7b9a80a912abeb799 | |
| parent | 82a2d2df3ed826b62f2d3327743691c8a0a4c104 (diff) | |
| parent | 8e03715a5cc1590da10e9f7b78d3960152086c71 (diff) | |
Merge pull request #19853 from khairul169/duplicate_bug
Fix duplicate method on instanced node generates duplicated children.
| -rw-r--r-- | scene/main/node.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/main/node.cpp b/scene/main/node.cpp index 6199f52ec5..6d18cce21d 100644 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -1895,7 +1895,7 @@ Node *Node::_duplicate(int p_flags, Map<const Node *, Node *> *r_duplimap) const // 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) + if (descendant->get_parent() && descendant->get_parent() != this && descendant->get_parent()->data.owner == this && descendant->data.owner != descendant->get_parent()) hidden_roots.push_back(descendant); continue; } |