diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-03-11 21:39:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-11 21:39:43 +0100 |
| commit | 27dea9366f0ab0229bc52a39ce701a46d107020b (patch) | |
| tree | 835efc7bcc5df9ab4092004aa70623d39db4c5ce /editor | |
| parent | 5024b7236e8cd36087b34bd3a3c9f8481bafb1e0 (diff) | |
| parent | 72134a7f2a4af1781208d6c46909d29caa5dbe19 (diff) | |
Merge pull request #46510 from hilfazer/nested_scene_duplication_4_0
Support for duplication of nested instanced scenes
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/scene_tree_dock.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index 16a0576af4..2cdab83d90 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -685,7 +685,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 = nullptr; - List<Node *> editable_children; selection.sort_custom<Node::Comparator>(); @@ -701,10 +700,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) { @@ -739,11 +734,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: { if (!profile_allow_editing) { |