Skip to content

Commit

Permalink
Backport gltf2 module from master.
Browse files Browse the repository at this point in the history
  • Loading branch information
fire authored and lyuma committed May 31, 2021
1 parent 8326b8b commit 6ec9468
Show file tree
Hide file tree
Showing 52 changed files with 10,957 additions and 3,796 deletions.
5 changes: 0 additions & 5 deletions editor/editor_node.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@
#include "editor/fileserver/editor_file_server.h"
#include "editor/filesystem_dock.h"
#include "editor/import/editor_import_collada.h"
#include "editor/import/editor_scene_importer_gltf.h"
#include "editor/import/resource_importer_bitmask.h"
#include "editor/import/resource_importer_csv_translation.h"
#include "editor/import/resource_importer_image.h"
Expand Down Expand Up @@ -5809,10 +5808,6 @@ EditorNode::EditorNode() {
import_obj2.instance();
import_scene->add_importer(import_obj2);

Ref<EditorSceneImporterGLTF> import_gltf;
import_gltf.instance();
import_scene->add_importer(import_gltf);

Ref<EditorSceneImporterESCN> import_escn;
import_escn.instance();
import_scene->add_importer(import_escn);
Expand Down
Loading

0 comments on commit 6ec9468

Please sign in to comment.