godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8379 from karroffel/obj-import-reenable 

re-enabled obj import
This commit is contained in:
Rémi Verschelde 2017-04-12 22:27:19 +02:00 committed by GitHub
parent e46af1e236 3bc09da0b1
commit c4d3dd1a48
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
editor/editor_node.cpp
View File

@ -4862,9 +4862,9 @@ EditorNode::EditorNode() {
import_wav.instance(); import_wav.instance();
ResourceFormatImporter::get_singleton()->add_importer(import_wav); ResourceFormatImporter::get_singleton()->add_importer(import_wav);
//Ref<ResourceImporterOBJ> import_obj; Ref<ResourceImporterOBJ> import_obj;
//import_obj.instance(); import_obj.instance();
//ResourceFormatImporter::get_singleton()->add_importer(import_obj); ResourceFormatImporter::get_singleton()->add_importer(import_obj);
Ref<ResourceImporterScene> import_scene; Ref<ResourceImporterScene> import_scene;
import_scene.instance(); import_scene.instance();