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/editor_node.h | |
| parent | 82033bf9b4ec90a59057bb3e6e1f405b9552277d (diff) | |
| parent | 6b4faa355cc966b4e6cffa51b4ad9b3bda7eb3ae (diff) | |
| download | redot-engine-72f74eb29e9e95928c8027da21151a32bad88300.tar.gz | |
Merge pull request #45943 from KoBeWi/YEEEET
Remove Merge From Scene
Diffstat (limited to 'editor/editor_node.h')
| -rw-r--r-- | editor/editor_node.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/editor/editor_node.h b/editor/editor_node.h index 8068ca89ee..8740488d18 100644 --- a/editor/editor_node.h +++ b/editor/editor_node.h @@ -128,7 +128,6 @@ private: FILE_SAVE_ALL_SCENES, FILE_SAVE_AND_RUN, FILE_SHOW_IN_FILESYSTEM, - FILE_IMPORT_SUBSCENE, FILE_EXPORT_PROJECT, FILE_EXPORT_MESH_LIBRARY, FILE_INSTALL_ANDROID_SOURCE, @@ -719,8 +718,6 @@ public: void save_resource(const Ref<Resource> &p_resource); void save_resource_as(const Ref<Resource> &p_resource, const String &p_at_path = String()); - void merge_from_scene() { _menu_option_confirm(FILE_IMPORT_SUBSCENE, false); } - void show_about() { _menu_option_confirm(HELP_ABOUT, false); } static bool has_unsaved_changes() { return singleton->unsaved_cache; } |