Skip to content

Commit

Permalink
Merge pull request #44428 from akien-mga/3.2-revert-43948
Browse files Browse the repository at this point in the history
Revert "Don't open editor window when using --export, --doctool, or --gdnative-generate-json-api"
  • Loading branch information
akien-mga authored Dec 16, 2020
2 parents 5d49894 + afbca12 commit 6e81462
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions main/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -703,26 +703,18 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph

auto_build_solutions = true;
editor = true;
OS::get_singleton()->set_no_window_mode(true);
auto_quit = true;
#ifdef DEBUG_METHODS_ENABLED
} else if (I->get() == "--gdnative-generate-json-api") {
// Register as an editor instance to use the GLES2 fallback automatically on hardware that doesn't support the GLES3 backend
editor = true;

// We still pass it to the main arguments since the argument handling itself is not done in this function
main_args.push_back(I->get());

OS::get_singleton()->set_no_window_mode(true);
auto_quit = true;
#endif
} else if (I->get() == "--export" || I->get() == "--export-debug" || I->get() == "--export-pack") { // Export project

editor = true;
main_args.push_back(I->get());

OS::get_singleton()->set_no_window_mode(true);
auto_quit = true;
#endif
} else if (I->get() == "--path") { // set path of project to start or edit

Expand Down

0 comments on commit 6e81462

Please sign in to comment.