diff options
| author | Rémi Verschelde | 2017-11-13 17:13:11 +0100 |
|---|---|---|
| committer | GitHub | 2017-11-13 17:13:11 +0100 |
| commit | 390e957ba4bbe1683915a5de21f9082f84f3ebe0 (patch) | |
| tree | ee5b702f0b2026cc132f049b540d1d1d60454143 /scene | |
| parent | ab0f7717e71efef3f09faedf66ad5ad38fefe99f (diff) | |
| parent | 6496b53549aca7b1be57c3be55815f32a4842201 (diff) | |
| download | godot-390e957ba4bbe1683915a5de21f9082f84f3ebe0.tar.gz godot-390e957ba4bbe1683915a5de21f9082f84f3ebe0.tar.zst godot-390e957ba4bbe1683915a5de21f9082f84f3ebe0.zip | |
Merge pull request #12893 from Chaosus/dupsignals
Duplicate signals fixes
Diffstat (limited to 'scene')
| -rwxr-xr-x | scene/main/node.cpp | 13 | ||||
| -rw-r--r-- | scene/main/node.h | 1 |
2 files changed, 1 insertions, 13 deletions
diff --git a/scene/main/node.cpp b/scene/main/node.cpp index e6e11de17..1889c09d9 100755 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -2067,7 +2067,7 @@ int Node::get_position_in_parent() const { return data.pos; } -Node *Node::_duplicate(int p_flags) const { +Node *Node::duplicate(int p_flags) const { Node *node = NULL; @@ -2170,17 +2170,6 @@ Node *Node::_duplicate(int p_flags) const { return node; } -Node *Node::duplicate(int p_flags) const { - - Node *dupe = _duplicate(p_flags); - - if (dupe && (p_flags & DUPLICATE_SIGNALS)) { - _duplicate_signals(this, dupe); - } - - return dupe; -} - void Node::_duplicate_and_reown(Node *p_new_parent, const Map<Node *, Node *> &p_reown_map) const { if (get_owner() != get_parent()->get_owner()) diff --git a/scene/main/node.h b/scene/main/node.h index c43e96063..e8901f7b6 100644 --- a/scene/main/node.h +++ b/scene/main/node.h @@ -169,7 +169,6 @@ private: void _duplicate_signals(const Node *p_original, Node *p_copy) const; void _duplicate_and_reown(Node *p_new_parent, const Map<Node *, Node *> &p_reown_map) const; - Node *_duplicate(int p_flags) const; Array _get_children() const; Array _get_groups() const; |