diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 3bfe1ea3afc..5148a404ee2 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -2640,7 +2640,7 @@ void EditorNode::_dialog_action(String p_file) { case SAVE_AND_SET_MAIN_SCENE: { _save_scene(p_file); - _menu_option_confirm(SCENE_SET_MAIN_SCENE, true); + _menu_option_confirm(SCENE_TAB_SET_AS_MAIN_SCENE, true); } break; case FILE_EXPORT_MESH_LIBRARY: { @@ -3375,7 +3375,7 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) { } break; - case SCENE_SET_MAIN_SCENE: { + case SCENE_TAB_SET_AS_MAIN_SCENE: { const String scene_path = editor_data.get_scene_path(editor_data.get_edited_scene()); if (scene_path.is_empty()) { current_menu_option = SAVE_AND_SET_MAIN_SCENE; diff --git a/editor/editor_node.h b/editor/editor_node.h index 579951e6125..6bc236235d0 100644 --- a/editor/editor_node.h +++ b/editor/editor_node.h @@ -148,7 +148,6 @@ public: SCENE_SAVE_SCENE, SCENE_SAVE_AS_SCENE, SCENE_SAVE_ALL_SCENES, - SCENE_SET_MAIN_SCENE, SCENE_MULTI_SAVE_AS_SCENE, SCENE_QUICK_OPEN, SCENE_QUICK_OPEN_SCENE, @@ -215,6 +214,7 @@ public: // Non-menu options. SCENE_TAB_CLOSE, + SCENE_TAB_SET_AS_MAIN_SCENE, SAVE_AND_RUN, SAVE_AND_RUN_MAIN_SCENE, SAVE_AND_SET_MAIN_SCENE, diff --git a/editor/scene/editor_scene_tabs.cpp b/editor/scene/editor_scene_tabs.cpp index 9725e13e202..e2d821fb992 100644 --- a/editor/scene/editor_scene_tabs.cpp +++ b/editor/scene/editor_scene_tabs.cpp @@ -204,7 +204,7 @@ void EditorSceneTabs::_update_context_menu() { DISABLE_LAST_OPTION_IF(!ResourceLoader::exists(scene_path)); scene_tabs_context_menu->add_item(TTR("Play This Scene"), SCENE_RUN); DISABLE_LAST_OPTION_IF(no_root_node); - scene_tabs_context_menu->add_item(TTR("Set as Main Scene"), EditorNode::SCENE_SET_MAIN_SCENE); + scene_tabs_context_menu->add_item(TTR("Set as Main Scene"), EditorNode::SCENE_TAB_SET_AS_MAIN_SCENE); DISABLE_LAST_OPTION_IF(no_root_node || (!main_scene_path.is_empty() && ResourceUID::ensure_path(main_scene_path) == scene_path)); scene_tabs_context_menu->add_separator();