From fc73f0c8b01ca5777f9c7970c5d78abc7c190b6e Mon Sep 17 00:00:00 2001 From: volzhs Date: Thu, 2 Jun 2016 22:03:58 +0900 Subject: [PATCH 1/2] 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() At: tools\editor\editor_import_export.cpp:1548 ``` it is caused by https://github.com/godotengine/godot/commit/8be2fabbe5cd846bac5e5a38e55f3fb70e73f2da#diff-67a74bd708380c6b3baa717bb178dd47R802 --- tools/editor/editor_import_export.cpp | 2 +- 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 plugin = EditorImportExport::get_singleton()->get_import_plugin_by_name("texture_atlas"); + Ref 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 plugin = EditorImportExport::get_singleton()->get_import_plugin_by_name("texture_atlas"); + Ref plugin = EditorImportExport::get_singleton()->get_import_plugin_by_name("texture"); Error err = plugin->import2(dst_file,imd,EditorExportPlatform::IMAGE_COMPRESSION_NONE,true); if (err) { From ee7d94bf1102425a669646e8712ad675b03c6165 Mon Sep 17 00:00:00 2001 From: volzhs Date: Thu, 2 Jun 2016 22:13:55 +0900 Subject: [PATCH 2/2] fix invalid texture plugin name EditorTextureImportPlugin had ``texture_2d``, ``texture_3d``, ``texture_atlas`` and ``larget_texture``. These are now just ``texture``. --- tools/editor/io_plugins/editor_texture_import_plugin.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/editor/io_plugins/editor_texture_import_plugin.cpp b/tools/editor/io_plugins/editor_texture_import_plugin.cpp index 21e7ee36bb..31b6333975 100644 --- a/tools/editor/io_plugins/editor_texture_import_plugin.cpp +++ b/tools/editor/io_plugins/editor_texture_import_plugin.cpp @@ -1834,7 +1834,7 @@ EditorTextureImportPlugin::EditorTextureImportPlugin(EditorNode *p_editor) { } else if (EditorImportExport::get_singleton()->image_get_export_group(p_path)) { - Ref pl = EditorImportExport::get_singleton()->get_import_plugin_by_name("texture_2d"); + Ref pl = EditorImportExport::get_singleton()->get_import_plugin_by_name("texture"); if (pl.is_valid()) { Vector ce = pl->custom_export(p_path,p_platform); if (ce.size()) { @@ -1848,7 +1848,7 @@ EditorTextureImportPlugin::EditorTextureImportPlugin(EditorNode *p_editor) { String xt = p_path.extension().to_lower(); if (EditorImportExport::get_singleton()->get_image_formats().has(xt)) { //should check for more I guess? - Ref pl = EditorImportExport::get_singleton()->get_import_plugin_by_name("texture_2d"); + Ref pl = EditorImportExport::get_singleton()->get_import_plugin_by_name("texture"); if (pl.is_valid()) { Vector ce = pl->custom_export(p_path,p_platform); if (ce.size()) {