From f14e43b68fafc1303230c1bc7786fbe23d86c523 Mon Sep 17 00:00:00 2001 From: Sofox Date: Fri, 15 Dec 2023 19:34:32 +0000 Subject: [PATCH] Fixed duplicating nodes at different depths in SceneTreeDock (cherry picked from commit ed648799aed3c2637e80415c4dcacdb896b350d4) --- editor/scene_tree_dock.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index b3987acabb0..fee70edd4b2 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -710,7 +710,14 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) { selection.sort_custom(); - Node *add_below_node = selection.back()->get(); + HashMap add_below_map; + + for (List::Element *E = selection.back(); E; E = E->prev()) { + Node *node = E->get(); + if (!add_below_map.has(node->get_parent())) { + add_below_map.insert(node->get_parent(), node); + } + } for (Node *node : selection) { Node *parent = node->get_parent(); @@ -737,7 +744,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) { dup->set_name(parent->validate_child_name(dup)); - undo_redo->add_do_method(add_below_node, "add_sibling", dup, true); + undo_redo->add_do_method(add_below_map[parent], "add_sibling", dup, true); for (Node *F : owned) { if (!duplimap.has(F)) { @@ -756,7 +763,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) { undo_redo->add_do_method(ed, "live_debug_duplicate_node", edited_scene->get_path_to(node), dup->get_name()); undo_redo->add_undo_method(ed, "live_debug_remove_node", NodePath(String(edited_scene->get_path_to(parent)).path_join(dup->get_name()))); - add_below_node = dup; + add_below_map[parent] = dup; } undo_redo->commit_action();