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

Merge pull request #38376 from dreamsComeTrue/duplicate-nodes-fix 

Proper naming and ordering when Duplicate nodes in SceneTreeDock
This commit is contained in:
Rémi Verschelde 2020-05-03 18:18:04 +02:00 committed by GitHub
parent cf398b8ee0 278259b433
commit 2df844d5b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
editor/scene_tree_dock.cpp
View File

@ -553,11 +553,12 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
selection.sort_custom<Node::Comparator>(); selection.sort_custom<Node::Comparator>();
for (List<Node *>::Element *E = selection.back(); E; E = E->prev()) { Node *add_below_node = selection.back()->get();
for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
Node *node = E->get(); Node *node = E->get();
Node *parent = node->get_parent(); Node *parent = node->get_parent();
Node *selection_tail = _get_selection_group_tail(node, selection);
List<Node *> owned; List<Node *> owned;
node->get_owned_by(node->get_owner(), &owned); node->get_owned_by(node->get_owner(), &owned);
@ -575,7 +576,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
dup->set_name(parent->validate_child_name(dup)); dup->set_name(parent->validate_child_name(dup));
editor_data->get_undo_redo().add_do_method(parent, "add_child_below_node", selection_tail, dup); editor_data->get_undo_redo().add_do_method(parent, "add_child_below_node", add_below_node, dup);
for (List<Node *>::Element *F = owned.front(); F; F = F->next()) { for (List<Node *>::Element *F = owned.front(); F; F = F->next()) {
if (!duplimap.has(F->get())) { if (!duplimap.has(F->get())) {
@ -583,7 +584,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
continue; continue;
} }
Node *d = duplimap[F->get()]; Node *d = duplimap[F->get()];
editor_data->get_undo_redo().add_do_method(d, "set_owner", selection_tail->get_owner()); editor_data->get_undo_redo().add_do_method(d, "set_owner", node->get_owner());
} }
editor_data->get_undo_redo().add_do_method(editor_selection, "add_node", dup); editor_data->get_undo_redo().add_do_method(editor_selection, "add_node", dup);
editor_data->get_undo_redo().add_undo_method(parent, "remove_child", dup); editor_data->get_undo_redo().add_undo_method(parent, "remove_child", dup);
@ -593,6 +594,8 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
editor_data->get_undo_redo().add_do_method(ed, "live_debug_duplicate_node", edited_scene->get_path_to(node), dup->get_name()); editor_data->get_undo_redo().add_do_method(ed, "live_debug_duplicate_node", edited_scene->get_path_to(node), dup->get_name());
editor_data->get_undo_redo().add_undo_method(ed, "live_debug_remove_node", NodePath(String(edited_scene->get_path_to(parent)).plus_file(dup->get_name()))); editor_data->get_undo_redo().add_undo_method(ed, "live_debug_remove_node", NodePath(String(edited_scene->get_path_to(parent)).plus_file(dup->get_name())));
add_below_node = dup;
} }
editor_data->get_undo_redo().commit_action(); editor_data->get_undo_redo().commit_action();
@ -600,7 +603,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
if (dupsingle) if (dupsingle)
editor->push_item(dupsingle); editor->push_item(dupsingle);
for (List<Node *>::Element *E = editable_children.front(); E; E = E->next()) for (List<Node *>::Element *E = editable_children.back(); E; E = E->prev())
_toggle_editable_children(E->get()); _toggle_editable_children(E->get());
} break; } break;