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

Remove warning on owner re-assignment (2.1)
This commit is contained in:
Rémi Verschelde 2017-03-18 10:49:35 +01:00 committed by GitHub
commit b5be9d6115

View file

@ -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 );