diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-04-12 22:27:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-12 22:27:19 +0200 |
| commit | c4d3dd1a486479b243999bdc30bf26e5683a3b33 (patch) | |
| tree | f7785398e9535dbf9b9f6145556519665503b3df | |
| parent | e46af1e23668e23160604742f8f1d22898796d1c (diff) | |
| parent | 3bc09da0b196ec6a0fb0297d32455b93757ff77e (diff) | |
Merge pull request #8379 from karroffel/obj-import-reenable
re-enabled obj import
| -rw-r--r-- | editor/editor_node.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 9baa203790..1223abd76c 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -4862,9 +4862,9 @@ EditorNode::EditorNode() { import_wav.instance(); ResourceFormatImporter::get_singleton()->add_importer(import_wav); - //Ref<ResourceImporterOBJ> import_obj; - //import_obj.instance(); - //ResourceFormatImporter::get_singleton()->add_importer(import_obj); + Ref<ResourceImporterOBJ> import_obj; + import_obj.instance(); + ResourceFormatImporter::get_singleton()->add_importer(import_obj); Ref<ResourceImporterScene> import_scene; import_scene.instance(); |