[Bf-extensions-cvs] [38be61eb] master: glTF exporter: images may be needlessly re-encoded in some cases

[Julien Duroure]

Commit: 38be61ebb868c0b56c140286af8720b2e7d0de11
Author: Julien Duroure
Date:   Thu Jan 20 18:36:14 2022 +0100
Branches: master
https://developer.blender.org/rBA38be61ebb868c0b56c140286af8720b2e7d0de11

glTF exporter: images may be needlessly re-encoded in some cases

===================================================================

M	io_scene_gltf2/__init__.py
M	io_scene_gltf2/blender/exp/gltf2_blender_image.py

===================================================================

diff --git a/io_scene_gltf2/__init__.py b/io_scene_gltf2/__init__.py
index c8fa899b..a31fad68 100755
--- a/io_scene_gltf2/__init__.py
+++ b/io_scene_gltf2/__init__.py
@@ -15,7 +15,7 @@
 bl_info = {
     'name': 'glTF 2.0 format',
     'author': 'Julien Duroure, Scurest, Norbert Nopper, Urs Hanselmann, Moritz Becher, Benjamin Schmithüsen, Jim Eckerlein, and many external contributors',
-    "version": (1, 8, 7),
+    "version": (1, 8, 8),
     'blender': (3, 0, 0),
     'location': 'File > Import-Export',
     'description': 'Import-Export as glTF 2.0',
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_image.py b/io_scene_gltf2/blender/exp/gltf2_blender_image.py
index 8ac272d8..fc41b7f2 100644
--- a/io_scene_gltf2/blender/exp/gltf2_blender_image.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_image.py
@@ -189,8 +189,7 @@ class ExportImage:
     def __encode_from_image(self, image: bpy.types.Image) -> bytes:
         # See if there is an existing file we can use.
         data = None
-        if image.source == 'FILE' and image.file_format == self.file_format and \
-                not image.is_dirty:
+        if image.source == 'FILE' and not image.is_dirty:
             if image.packed_file is not None:
                 data = image.packed_file.data
             else: