diff options
| author | Juan Linietsky | 2016-10-30 09:00:45 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2016-10-30 09:00:45 -0300 |
| commit | ab4126f51061277e87b41c48b40e7b54942d4eca (patch) | |
| tree | c58168b60323c4d43b58743b099e562a89e60a56 /main/main.cpp | |
| parent | 8b15b26eedad4fdd33d50f5f9aa0fcc1875d503f (diff) | |
| parent | 914015f3b63dd956e72ea937d46ea4b2db005ada (diff) | |
| download | godot-ab4126f51061277e87b41c48b40e7b54942d4eca.tar.gz godot-ab4126f51061277e87b41c48b40e7b54942d4eca.tar.zst godot-ab4126f51061277e87b41c48b40e7b54942d4eca.zip | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'main/main.cpp')
| -rw-r--r-- | main/main.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/main/main.cpp b/main/main.cpp index d80381754..7db04023a 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -57,7 +57,6 @@ #include "tools/editor/editor_node.h" #include "tools/editor/project_manager.h" -#include "tools/pck/pck_packer.h" #endif #include "io/file_access_network.h" @@ -560,6 +559,16 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas goto error; } + } else if (I->get()=="-epid") { + if (I->next()) { + + int editor_pid=I->next()->get().to_int(); + Globals::get_singleton()->set("editor_pid",editor_pid); + N=I->next()->next(); + } else { + goto error; + + } } else { //test for game path @@ -996,7 +1005,7 @@ Error Main::setup2() { #ifdef TOOLS_ENABLED ObjectTypeDB::set_current_api(ObjectTypeDB::API_EDITOR); EditorNode::register_editor_types(); - ObjectTypeDB::register_type<PCKPacker>(); // todo: move somewhere else + ObjectTypeDB::set_current_api(ObjectTypeDB::API_CORE); #endif @@ -1759,4 +1768,3 @@ void Main::cleanup() { } - |