diff options
| author | Juan Linietsky | 2015-06-06 10:12:09 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-06-06 10:12:09 -0300 |
| commit | 697482328863b2790597df1efde0c3a0b4a9772e (patch) | |
| tree | 64c1a03bfc9cdf8471cd8ae21c8be97b80d8709e /tools/editor/editor_node.cpp | |
| parent | 9acab32daaea38e09c4d74d5f0340479d3dd41bd (diff) | |
| parent | 8dde67cf706ae6e6a33eefdf69aa6922fac0e909 (diff) | |
| download | godot-697482328863b2790597df1efde0c3a0b4a9772e.tar.gz godot-697482328863b2790597df1efde0c3a0b4a9772e.tar.zst godot-697482328863b2790597df1efde0c3a0b4a9772e.zip | |
Merge remote-tracking branch 'origin/master'
Conflicts:
tools/editor/io_plugins/editor_texture_import_plugin.cpp
Diffstat (limited to 'tools/editor/editor_node.cpp')
| -rw-r--r-- | tools/editor/editor_node.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 0166d45de..0ab50147b 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -4229,8 +4229,9 @@ EditorNode::EditorNode() { editor_import_export->add_import_plugin( Ref<EditorTextureImportPlugin>( memnew(EditorTextureImportPlugin(this,EditorTextureImportPlugin::MODE_TEXTURE_2D) ))); - editor_import_export->add_import_plugin( Ref<EditorTextureImportPlugin>( memnew(EditorTextureImportPlugin(this,EditorTextureImportPlugin::MODE_TEXTURE_3D) ))); editor_import_export->add_import_plugin( Ref<EditorTextureImportPlugin>( memnew(EditorTextureImportPlugin(this,EditorTextureImportPlugin::MODE_ATLAS) ))); + editor_import_export->add_import_plugin( Ref<EditorTextureImportPlugin>( memnew(EditorTextureImportPlugin(this,EditorTextureImportPlugin::MODE_LARGE) ))); + editor_import_export->add_import_plugin( Ref<EditorTextureImportPlugin>( memnew(EditorTextureImportPlugin(this,EditorTextureImportPlugin::MODE_TEXTURE_3D) ))); Ref<EditorSceneImportPlugin> _scene_import = memnew(EditorSceneImportPlugin(this) ); Ref<EditorSceneImporterCollada> _collada_import = memnew( EditorSceneImporterCollada); _scene_import->add_importer(_collada_import); |