aboutsummaryrefslogtreecommitdiff
path: root/tools/editor/editor_node.cpp
diff options
context:
space:
mode:
authorJuan Linietsky2017-02-04 09:48:04 -0300
committerJuan Linietsky2017-02-04 09:48:04 -0300
commit27eae4ada1eeecd63f8733bfc477e22508c893a6 (patch)
tree51941d8df41420575eb2a4110e3b1f64730fc1dc /tools/editor/editor_node.cpp
parentd2b2d6801f9cf454a880a92aaa9aa38ce4264002 (diff)
downloadgodot-27eae4ada1eeecd63f8733bfc477e22508c893a6.tar.gz
godot-27eae4ada1eeecd63f8733bfc477e22508c893a6.tar.zst
godot-27eae4ada1eeecd63f8733bfc477e22508c893a6.zip
Scene import more or less working, needs some missing features.
Diffstat (limited to '')
-rw-r--r--tools/editor/editor_node.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index 9607ee987..03b65992f 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -103,6 +103,7 @@
#include "import/resource_importer_csv_translation.h"
#include "import/resource_importer_wav.h"
#include "import/resource_importer_obj.h"
+#include "import/resource_importer_scene.h"
// end
#include "editor_settings.h"
#include "io_plugins/editor_texture_import_plugin.h"
@@ -113,7 +114,7 @@
#include "io_plugins/editor_bitmask_import_plugin.h"
#include "io_plugins/editor_mesh_import_plugin.h"
#include "io_plugins/editor_export_scene.h"
-#include "io_plugins/editor_import_collada.h"
+#include "import/editor_import_collada.h"
#include "io_plugins/editor_scene_importer_fbxconv.h"
#include "plugins/editor_preview_plugins.h"
@@ -5137,6 +5138,16 @@ EditorNode::EditorNode() {
import_obj.instance();
ResourceFormatImporter::get_singleton()->add_importer(import_obj);
+ Ref<ResourceImporterScene> import_scene;
+ import_scene.instance();
+ ResourceFormatImporter::get_singleton()->add_importer(import_scene);
+
+ {
+ Ref<EditorSceneImporterCollada> import_collada;
+ import_collada.instance();
+ import_scene->add_importer(import_collada);
+ }
+
}
_pvrtc_register_compressors();