diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-02-18 15:15:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-18 15:15:19 +0100 |
| commit | 72f74eb29e9e95928c8027da21151a32bad88300 (patch) | |
| tree | a9a645f25bdaaab56515aadc485dd585256fdda0 /editor/scene_tree_dock.h | |
| parent | 82033bf9b4ec90a59057bb3e6e1f405b9552277d (diff) | |
| parent | 6b4faa355cc966b4e6cffa51b4ad9b3bda7eb3ae (diff) | |
Merge pull request #45943 from KoBeWi/YEEEET
Remove Merge From Scene
Diffstat (limited to 'editor/scene_tree_dock.h')
| -rw-r--r-- | editor/scene_tree_dock.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/editor/scene_tree_dock.h b/editor/scene_tree_dock.h index a042188be6..9bc281c7fb 100644 --- a/editor/scene_tree_dock.h +++ b/editor/scene_tree_dock.h @@ -34,7 +34,6 @@ #include "editor/connections_dialog.h" #include "editor/create_dialog.h" #include "editor/editor_data.h" -#include "editor/editor_sub_scene.h" #include "editor/groups_editor.h" #include "editor/quick_open.h" #include "editor/rename_dialog.h" @@ -74,7 +73,6 @@ class SceneTreeDock : public VBoxContainer { TOOL_REPARENT_TO_NEW_NODE, TOOL_MAKE_ROOT, TOOL_NEW_SCENE_FROM, - TOOL_MERGE_FROM_SCENE, TOOL_MULTI_EDIT, TOOL_ERASE, TOOL_COPY_NODE_PATH, @@ -141,7 +139,6 @@ class SceneTreeDock : public VBoxContainer { ReparentDialog *reparent_dialog; EditorQuickOpen *quick_open; - EditorSubScene *import_subscene_dialog; EditorFileDialog *new_scene_from_dialog; LineEdit *filter; |