godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-11 13:10:58 +00:00
Code Releases Wiki Activity

Merge pull request #8037 from RandomShaper/remove-warning

Browse Source 
Remove warning on owner re-assignment
This commit is contained in:
Rémi Verschelde
2017-03-18 10:49:06 +01:00
committed by GitHub
parent 60bdc37056 e3b4b7fa98
commit 14c01dfea7
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scene/main/node.cpp
View File

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