Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Merge From Scene #45943

Merged
merged 1 commit into from
Feb 18, 2021
Merged

Remove Merge From Scene #45943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions editor/editor_node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2513,16 +2513,6 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {

} break;

case FILE_IMPORT_SUBSCENE: {
if (!editor_data.get_edited_scene_root()) {
show_accept(TTR("This operation can't be done without a selected node."), TTR("OK"));
break;
}

scene_tree_dock->import_subscene();

} break;

case FILE_EXTERNAL_OPEN_SCENE: {
if (unsaved_cache && !p_confirmed) {
confirmation->get_ok_button()->set_text(TTR("Open"));
Expand Down
3 changes: 0 additions & 3 deletions editor/editor_node.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ class EditorNode : public Node {
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,
Expand Down Expand Up @@ -716,8 +715,6 @@ class EditorNode : public Node {
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; }
Expand Down
265 changes: 0 additions & 265 deletions editor/editor_sub_scene.cpp
View file
Open in desktop

This file was deleted.

71 changes: 0 additions & 71 deletions editor/editor_sub_scene.h
View file
Open in desktop

This file was deleted.

Loading