godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-03 16:55:53 +00:00
Code Releases Wiki Activity

Merge pull request #112904 from vaner-org/fix-scene-export-as-regression

Browse Source 
Fix `Scene > Export As...` being incorrectly disabled
This commit is contained in:
Thaddeus Crews
2025-11-18 08:25:41 -06:00
parent 3a3af8d806 6a5c7de993
commit 9ce8d2da20
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
editor/editor_node.cpp
View File

@@ -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;

2
editor/editor_node.h
View File

@@ -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,

2
editor/scene/editor_scene_tabs.cpp
View File

@@ -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();