diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-06-02 22:07:05 +0200 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-06-02 22:07:05 +0200 |
| commit | b38ee6b1f98bea4c4870722cae2e3260ff1ef4d3 (patch) | |
| tree | ee73573a96e03e51bdecd51ac001b5ccd467f571 | |
| parent | 25800e958c3179e4ff3c2a587d614d7421ea79b1 (diff) | |
| parent | ee7d94bf1102425a669646e8712ad675b03c6165 (diff) | |
Merge pull request #4989 from volzhs/fix-texture-atlas-error
fix crash and error with texture atlas
| -rw-r--r-- | tools/editor/editor_import_export.cpp | 2 | ||||
| -rw-r--r-- | tools/editor/io_plugins/editor_texture_import_plugin.cpp | 4 | ||||
| -rw-r--r-- | tools/editor/project_export.cpp | 2 |
3 files changed, 4 insertions, 4 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/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<EditorImportPlugin> pl = EditorImportExport::get_singleton()->get_import_plugin_by_name("texture_2d"); + Ref<EditorImportPlugin> pl = EditorImportExport::get_singleton()->get_import_plugin_by_name("texture"); if (pl.is_valid()) { Vector<uint8_t> 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<EditorImportPlugin> pl = EditorImportExport::get_singleton()->get_import_plugin_by_name("texture_2d"); + Ref<EditorImportPlugin> pl = EditorImportExport::get_singleton()->get_import_plugin_by_name("texture"); if (pl.is_valid()) { Vector<uint8_t> ce = pl->custom_export(p_path,p_platform); if (ce.size()) { 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) { |