godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-07 17:36:07 +00:00
Code Releases Wiki Activity

Merge pull request #46292 from hilfazer/nested_scene_instances_duplication

Browse Source
This commit is contained in:
Rémi Verschelde
2021-04-29 13:31:27 +02:00
committed by GitHub
parent 188147e82c c76e832b1c
commit 880b830ca8
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
editor/scene_tree_dock.cpp
View File

@@ -671,7 +671,6 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
editor_data->get_undo_redo().add_do_method(editor_selection, "clear");
Node *dupsingle = NULL;
List<Node *> editable_children;
selection.sort_custom<Node::Comparator>();
@@ -688,9 +687,6 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
Map<const Node *, Node *> duplimap;
Node *dup = node->duplicate_from_editor(duplimap);
if (EditorNode::get_singleton()->get_edited_scene()->is_editable_instance(node))
editable_children.push_back(dup);
ERR_CONTINUE(!dup);
if (selection.size() == 1)
@@ -724,10 +720,6 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
if (dupsingle)
editor->push_item(dupsingle);
for (List<Node *>::Element *E = editable_children.back(); E; E = E->prev())
_toggle_editable_children(E->get());
} break;
case TOOL_REPARENT: {