diff options
| author | Juan Linietsky | 2015-06-01 19:42:34 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-06-01 19:42:34 -0300 |
| commit | ab99671bb835a5fe24a092ec34afe1ad862ac254 (patch) | |
| tree | 0b7b830b03f49c0833fe0552722f20b8fdba7769 /tools/editor/editor_node.cpp | |
| parent | 07a466f6e6dd28bbb8b917690b634070537f1613 (diff) | |
| download | godot-ab99671bb835a5fe24a092ec34afe1ad862ac254.tar.gz godot-ab99671bb835a5fe24a092ec34afe1ad862ac254.tar.zst godot-ab99671bb835a5fe24a092ec34afe1ad862ac254.zip | |
-fixes to navigation, so edge-merging is more flexible on conflict
-add tab support to richtextlabel
-some click fixes to audio stream resampled
-ability to import largetextures (dialog)
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); |