godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-16 14:00:40 +00:00
Code Releases Wiki Activity

Merge branch 'master' of https://github.com/godotengine/godot

Browse Source
This commit is contained in:
Juan Linietsky
2016-10-30 09:00:45 -03:00
parent 8b15b26eed 914015f3b6
commit ab4126f510
2805 changed files with 30798 additions and 49863 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
main/main.cpp
View File

@@ -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"
@@ -559,6 +558,16 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas
} else {
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 {
@@ -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() {
}