maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #30154 from bojidar-bg/30149-export-flag-editor

Browse source 
Ensure --export implies --editor
This commit is contained in:
Rémi Verschelde 2019-06-29 18:16:43 +02:00 committed by GitHub
parent 5cf51cc7e4 9ebc146383
commit b0809046be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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

@ -599,6 +599,10 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
auto_build_solutions = true;
editor = true;
} else if (I->get() == "--export" || I->get() == "--export-debug") { // Export project
editor = true;
main_args.push_back(I->get());
#endif
} else if (I->get() == "--path") { // set path of project to start or edit
@ -1343,20 +1347,10 @@ bool Main::start() {
removal_docs.push_back(args[j]);
} else if (args[i] == "--export") {
editor = true; //needs editor
if (i + 1 < args.size()) {
_export_preset = args[i + 1];
} else {
ERR_PRINT("Export preset name not specified");
return false;
}
_export_preset = args[i + 1];
} else if (args[i] == "--export-debug") {
editor = true; //needs editor
if (i + 1 < args.size()) {
_export_preset = args[i + 1];
} else {
ERR_PRINT("Export preset name not specified");
return false;
}
_export_preset = args[i + 1];
export_debug = true;
#endif
} else {