mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-12-15 10:12:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32247 from KoBeWi/the_new_order

Browse Source 
Perform reparent if position changes
This commit is contained in:
Rémi Verschelde 2019-09-22 21:19:58 +02:00 committed by GitHub
commit f65c61434b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
editor/scene_tree_dock.cpp
View File

@ -1552,18 +1552,20 @@ void SceneTreeDock::_do_reparent(Node *p_new_parent, int p_position_in_parent, V
if (p_nodes.size() == 0) if (p_nodes.size() == 0)
return; // Nothing to reparent. return; // Nothing to reparent.
bool same_parent = true; p_nodes.sort_custom<Node::Comparator>(); //Makes result reliable.
bool no_change = true;
for (int ni = 0; ni < p_nodes.size(); ni++) { for (int ni = 0; ni < p_nodes.size(); ni++) {
if (p_nodes[ni] == p_new_parent) if (p_nodes[ni] == p_new_parent)
return; // Attempt to reparent to itself. return; // Attempt to reparent to itself.
if (p_nodes[ni]->get_parent() != p_new_parent) if (p_nodes[ni]->get_parent() != p_new_parent || p_position_in_parent + ni != p_nodes[ni]->get_position_in_parent())
same_parent = false; no_change = false;
} }
if (same_parent) if (no_change)
return; // No new parent changes. return; // Position and parent didn't change.
Node *validate = new_parent; Node *validate = new_parent;
while (validate) { while (validate) {