Browse Source

Merge pull request #8038 from RandomShaper/remove-warning-2.1

Remove warning on owner re-assignment (2.1)
Rémi Verschelde 8 years ago
parent
commit
b5be9d6115
1 changed files with 3 additions and 0 deletions
  1. 3 0
      scene/main/node.cpp

+ 3 - 0
scene/main/node.cpp

@@ -1080,6 +1080,9 @@ void Node::get_owned_by(Node *p_by,List<Node*> *p_owned) {
 
 void Node::_set_owner_nocheck(Node* p_owner) {
 
+	if (data.owner==p_owner)
+		return;
+
 	ERR_FAIL_COND(data.owner);
 	data.owner=p_owner;
 	data.owner->data.owned.push_back( this );