diff options
| author | volzhs <volzhs@gmail.com> | 2016-06-02 22:03:58 +0900 |
|---|---|---|
| committer | volzhs <volzhs@gmail.com> | 2016-06-02 22:03:58 +0900 |
| commit | fc73f0c8b01ca5777f9c7970c5d78abc7c190b6e (patch) | |
| tree | becffcdfd53bb7709100128d110583f7df008f80 | |
| parent | 182ee80b7d0e187053150add897931363e5caab4 (diff) | |
fix crash and error with texture atlas
- crashes at Project Export Settings > Preview Atlas
- error message when export project
```
ERROR: EditorImportExport::get_import_plugin_by_name: Condition ' !by_idx.has(p_string) ' is true. returned: Ref<EditorImportPlugin>()
At: tools\editor\editor_import_export.cpp:1548
```
it is caused by https://github.com/godotengine/godot/commit/8be2fabbe5cd846bac5e5a38e55f3fb70e73f2da#diff-67a74bd708380c6b3baa717bb178dd47R802
| -rw-r--r-- | tools/editor/editor_import_export.cpp | 2 | ||||
| -rw-r--r-- | tools/editor/project_export.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/editor/editor_import_export.cpp b/tools/editor/editor_import_export.cpp index ac7ea514d7..f9b9c0b41c 100644 --- a/tools/editor/editor_import_export.cpp +++ b/tools/editor/editor_import_export.cpp @@ -889,7 +889,7 @@ Error EditorExportPlatform::export_project_files(EditorExportSaveFunction p_func - Ref<EditorTextureImportPlugin> plugin = EditorImportExport::get_singleton()->get_import_plugin_by_name("texture_atlas"); + Ref<EditorTextureImportPlugin> plugin = EditorImportExport::get_singleton()->get_import_plugin_by_name("texture"); Error err = plugin->import2(dst_file,imd,get_image_compression(),true); if (err) { diff --git a/tools/editor/project_export.cpp b/tools/editor/project_export.cpp index 7f016ead2d..3b02c73189 100644 --- a/tools/editor/project_export.cpp +++ b/tools/editor/project_export.cpp @@ -1057,7 +1057,7 @@ void ProjectExportDialog::_group_atlas_preview() { imd->set_option("atlas",true); imd->set_option("crop",true); - Ref<EditorTextureImportPlugin> plugin = EditorImportExport::get_singleton()->get_import_plugin_by_name("texture_atlas"); + Ref<EditorTextureImportPlugin> plugin = EditorImportExport::get_singleton()->get_import_plugin_by_name("texture"); Error err = plugin->import2(dst_file,imd,EditorExportPlatform::IMAGE_COMPRESSION_NONE,true); if (err) { |