summaryrefslogtreecommitdiff
path: root/scene/main
diff options
context:
space:
mode:
authorChaosus <chaosus89@gmail.com>2017-11-13 13:54:40 +0300
committerChaosus <chaosus89@gmail.com>2017-11-13 18:42:07 +0300
commit6496b53549aca7b1be57c3be55815f32a4842201 (patch)
tree119a93ad27623970fa0d74825e9d42c16564cca4 /scene/main
parent0dd96bccd3fd14c2c0380ecc6326d2a655d8d826 (diff)
Duplicate signals fixes
Diffstat (limited to 'scene/main')
-rwxr-xr-xscene/main/node.cpp13
-rw-r--r--scene/main/node.h1
2 files changed, 1 insertions, 13 deletions
diff --git a/scene/main/node.cpp b/scene/main/node.cpp
index e6e11de177..1889c09d9e 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 c43e96063f..e8901f7b6e 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;