diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-22 18:59:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-22 18:59:38 +0200 |
| commit | 46450979dbcb6014957d8849c98efa81d0c921f4 (patch) | |
| tree | f2c4da5c56de468377a64fe993383d0b7bf6bd94 | |
| parent | 2a3f650bf6da47b76e6a2a2dc9e104ad91849e4b (diff) | |
| parent | 6852b29658954f476530c7f07aa7cc3d262a7938 (diff) | |
Merge pull request #38942 from neikeq/hinjaku-hinjaku
Fix editor ignoring 'single_window_mode' with no main scene
| -rw-r--r-- | main/main.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/main/main.cpp b/main/main.cpp index 68016a5cef..f05032e68c 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -1958,6 +1958,16 @@ bool Main::start() { ProjectSettings::get_singleton()->set_custom_property_info("rendering/canvas_textures/default_texture_repeat", PropertyInfo(Variant::INT, "rendering/canvas_textures/default_texture_repeat", PROPERTY_HINT_ENUM, "Disable,Enable,Mirror")); } +#ifdef TOOLS_ENABLED + if (editor) { + bool editor_embed_subwindows = EditorSettings::get_singleton()->get_setting("interface/editor/single_window_mode"); + + if (editor_embed_subwindows) { + sml->get_root()->set_embed_subwindows_hint(true); + } + } +#endif + String local_game_path; if (game_path != "" && !project_manager) { local_game_path = game_path.replace("\\", "/"); @@ -1991,12 +2001,6 @@ bool Main::start() { #ifdef TOOLS_ENABLED if (editor) { - bool editor_embed_subwindows = EditorSettings::get_singleton()->get_setting("interface/editor/single_window_mode"); - - if (editor_embed_subwindows) { - sml->get_root()->set_embed_subwindows_hint(true); - } - if (game_path != GLOBAL_GET("application/run/main_scene") || !editor_node->has_scenes_in_session()) { Error serr = editor_node->load_scene(local_game_path); if (serr != OK) { |