diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2015-11-24 09:35:28 +0100 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2015-11-24 09:35:28 +0100 |
| commit | 96115ac9750979f47b9006612c0e88809dc7a913 (patch) | |
| tree | a9f8baa7fd10320366ed5a5b00332f8763cbb5bc | |
| parent | 14145d516e2e2f6f7221c691bfdedcc34b71f28e (diff) | |
| parent | f99b630993166725e91ccf2868cc4cefe2008286 (diff) | |
Merge pull request #2872 from akien-mga/pr-load-main-scene
Load main scene if defined when running editor from the command line
| -rw-r--r-- | main/main.cpp | 4 | ||||
| -rw-r--r-- | tools/editor/project_manager.cpp | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/main/main.cpp b/main/main.cpp index b6bc10cee7..3ea9128e13 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -432,7 +432,6 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas } else if (I->get()=="-e" || I->get()=="-editor") { // fonud editor editor=true; - init_maximized=true; } else if (I->get()=="-nowindow") { // fullscreen OS::get_singleton()->set_no_window_mode(true); @@ -649,6 +648,7 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas if (editor) { main_args.push_back("-editor"); + init_maximized=true; use_custom_res=false; } @@ -1093,7 +1093,7 @@ bool Main::start() { #endif - if(script=="" && game_path=="" && !editor && String(GLOBAL_DEF("application/main_scene",""))!="") { + if(script=="" && game_path=="" && String(GLOBAL_DEF("application/main_scene",""))!="") { game_path=GLOBAL_DEF("application/main_scene",""); } diff --git a/tools/editor/project_manager.cpp b/tools/editor/project_manager.cpp index 893df04709..04705017d2 100644 --- a/tools/editor/project_manager.cpp +++ b/tools/editor/project_manager.cpp @@ -624,11 +624,6 @@ void ProjectManager::_open_project_confirm() { args.push_back("-editor"); - const String &selected_main = E->get(); - if (selected_main!="") { - args.push_back(selected_main); - } - String exec = OS::get_singleton()->get_executable_path(); OS::ProcessID pid=0; |