[Bf-extensions-cvs] [3b088fc3] blender-v3.1-release: glTF exporter: workaround for image size copy not stored
Julien Duroure
noreply at git.blender.org
Sat Feb 12 13:55:06 CET 2022
Commit: 3b088fc33dc62950887977ee3ecd0ce01d03ebd3
Author: Julien Duroure
Date: Sat Feb 12 13:54:55 2022 +0100
Branches: blender-v3.1-release
https://developer.blender.org/rBA3b088fc33dc62950887977ee3ecd0ce01d03ebd3
glTF exporter: workaround for image size copy not stored
===================================================================
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 97574bb9..50d4f013 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, 15),
+ "version": (1, 8, 16),
'blender': (3, 1, 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 fc41b7f2..3f6a4442 100644
--- a/io_scene_gltf2/blender/exp/gltf2_blender_image.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_image.py
@@ -245,8 +245,10 @@ def _make_temp_image_copy(guard: TmpImageGuard, src_image: bpy.types.Image):
tmp_image = guard.image
tmp_image.update()
+ # See #1564 and T95616
+ tmp_image.scale(*src_image.size)
- if src_image.is_dirty:
+ if src_image.is_dirty: # Warning, img size change doesn't make it dirty, see T95616
# Unsaved changes aren't copied by .copy(), so do them ourselves
tmp_buf = np.empty(src_image.size[0] * src_image.size[1] * 4, np.float32)
src_image.pixels.foreach_get(tmp_buf)
More information about the Bf-extensions-cvs
mailing list