godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure --export implies --editor 

Fixes #30149

(cherry picked from commit 9ebc146383)
This commit is contained in:
Bojidar Marinov 2019-06-28 15:34:09 +03:00 committed by Rémi Verschelde
parent 6be8a83584
commit a2dae3379d
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
main/main.cpp
View File

@ -537,6 +537,10 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
auto_build_solutions = true; auto_build_solutions = true;
editor = true; editor = true;
} else if (I->get() == "--export" || I->get() == "--export-debug") { // Export project
editor = true;
main_args.push_back(I->get());
#endif #endif
} else if (I->get() == "--no-window") { // disable window creation, Windows only } else if (I->get() == "--no-window") { // disable window creation, Windows only
@ -1286,20 +1290,10 @@ bool Main::start() {
removal_docs.push_back(args[j]); removal_docs.push_back(args[j]);
} else if (args[i] == "--export") { } else if (args[i] == "--export") {
editor = true; //needs editor editor = true; //needs editor
if (i + 1 < args.size()) { _export_preset = args[i + 1];
_export_preset = args[i + 1];
} else {
ERR_PRINT("Export preset name not specified");
return false;
}
} else if (args[i] == "--export-debug") { } else if (args[i] == "--export-debug") {
editor = true; //needs editor editor = true; //needs editor
if (i + 1 < args.size()) { _export_preset = args[i + 1];
_export_preset = args[i + 1];
} else {
ERR_PRINT("Export preset name not specified");
return false;
}
export_debug = true; export_debug = true;
#endif #endif
} else { } else {