diff options
author | Julien Duroure <julien.duroure@gmail.com> | 2020-04-11 16:34:44 +0300 |
---|---|---|
committer | Julien Duroure <julien.duroure@gmail.com> | 2020-04-11 16:34:44 +0300 |
commit | 7a3fdf08f3fe4984bc81219a075a8bd3234c7d72 (patch) | |
tree | cab2cebb70396a96c51205b044526945a895f4f2 /io_scene_gltf2/blender/exp/gltf2_blender_gather_image.py | |
parent | 43148f17496ce7d51f0377631b6d393756b22724 (diff) |
glTF exporter: less naive file format detection for textures
Diffstat (limited to 'io_scene_gltf2/blender/exp/gltf2_blender_gather_image.py')
-rwxr-xr-x | io_scene_gltf2/blender/exp/gltf2_blender_gather_image.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_image.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_image.py index d1579803..c9683baf 100755 --- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_image.py +++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_image.py @@ -103,7 +103,7 @@ def __gather_mime_type(sockets_or_slots, export_image, export_settings): if export_settings["gltf_image_format"] == "AUTO": image = export_image.blender_image() - if image is not None and image.file_format == 'JPEG': + if image is not None and __is_blender_image_a_jpeg(image): return "image/jpeg" return "image/png" @@ -244,3 +244,10 @@ def __get_texname_from_slot(sockets_or_slots, export_settings): elif isinstance(sockets_or_slots[0], bpy.types.MaterialTextureSlot): return sockets_or_slots[0].texture.image.name + + +def __is_blender_image_a_jpeg(image: bpy.types.Image) -> bool: + if image.source != 'FILE': + return False + path = image.filepath_raw.lower() + return path.endswith('.jpg') or path.endswith('.jpeg') or path.endswith('.jpe') |