diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-04-06 09:44:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-06 09:44:38 +0200 |
| commit | 6b07c72d760a90acd862f636ac44b6945b8fa45b (patch) | |
| tree | 283c18d31c448a2db93b84d2df7202333f783ac3 /editor/scene_tree_dock.cpp | |
| parent | 11f31a732922571bf6e0398a5192132ae67aee16 (diff) | |
| parent | c1023157eb761efcda07c3fa2015517b8a3621e1 (diff) | |
| download | redot-engine-6b07c72d760a90acd862f636ac44b6945b8fa45b.tar.gz | |
Merge pull request #37556 from KoBeWi/kill_get_index
Remove Node.get_position_in_parent()
Diffstat (limited to 'editor/scene_tree_dock.cpp')
| -rw-r--r-- | editor/scene_tree_dock.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index eaefd04c6b..a729f62123 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -1535,7 +1535,7 @@ void SceneTreeDock::_do_reparent(Node *p_new_parent, int p_position_in_parent, V if (p_nodes[ni] == p_new_parent) return; // Attempt to reparent to itself. - if (p_nodes[ni]->get_parent() != p_new_parent || p_position_in_parent + ni != p_nodes[ni]->get_position_in_parent()) + if (p_nodes[ni]->get_parent() != p_new_parent || p_position_in_parent + ni != p_nodes[ni]->get_index()) no_change = false; } @@ -1644,7 +1644,7 @@ void SceneTreeDock::_do_reparent(Node *p_new_parent, int p_position_in_parent, V owners.push_back(E->get()); } - int child_pos = node->get_position_in_parent(); + int child_pos = node->get_index(); editor_data->get_undo_redo().add_undo_method(node->get_parent(), "add_child", node); editor_data->get_undo_redo().add_undo_method(node->get_parent(), "move_child", node, child_pos); @@ -1918,7 +1918,7 @@ Node *SceneTreeDock::_get_selection_group_tail(Node *p_node, List<Node *> p_list Node *tail = p_node; Node *parent = tail->get_parent(); - for (int i = p_node->get_position_in_parent(); i < parent->get_child_count(); i++) { + for (int i = p_node->get_index(); i < parent->get_child_count(); i++) { Node *sibling = parent->get_child(i); if (p_list.find(sibling)) |