godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17321 from LinkDoyle/issue_16350 

Fix switching WindowDialog types leaves garbage buttons
This commit is contained in:
Rémi Verschelde 2018-03-23 11:38:59 +01:00 committed by GitHub
parent 32c726f7cd 611c050469
commit 01bb39ac3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scene/main/node.cpp
View File

@ -2502,7 +2502,10 @@ void Node::replace_by(Node *p_node, bool p_keep_data) {
Node *child = get_child(0);
remove_child(child);
p_node->add_child(child);
if (!child->is_owned_by_parent()) {
// add the custom children to the p_node
p_node->add_child(child);
}
}
p_node->set_owner(owner);