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

Merge pull request #6677 from J08nY/issue-pck-packer

Browse Source 
PCKPacker: Move to core from tools, fixes #4129
This commit is contained in:
Rémi Verschelde
2016-10-03 12:06:19 +02:00
committed by GitHub
parent a1a81906c9 b1fba2e013
commit b675710b46
6 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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"
@@ -1006,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
@@ -1765,4 +1764,3 @@ void Main::cleanup() {
}