diff options
| author | Julien Duroure <julien.duroure@gmail.com> | 2022-02-12 15:55:43 +0300 |
|---|---|---|
| committer | Julien Duroure <julien.duroure@gmail.com> | 2022-02-12 15:55:43 +0300 |
| commit | 693a5d4fa7eefafe322d3494245443d7978345ba (patch) | |
| tree | ee25cb562566dcb632af3fc10a9643e493345428 | |
| parent | ef29d3b8f4264fcb229e73e6c418b1f5b54deddd (diff) | |
| parent | 3b088fc33dc62950887977ee3ecd0ce01d03ebd3 (diff) | |
Merge branch 'blender-v3.1-release'
| -rwxr-xr-x | io_scene_gltf2/__init__.py | 2 | ||||
| -rw-r--r-- | io_scene_gltf2/blender/exp/gltf2_blender_image.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/io_scene_gltf2/__init__.py b/io_scene_gltf2/__init__.py index 6be5d1ec..7e1ff49d 100755 --- a/io_scene_gltf2/__init__.py +++ b/io_scene_gltf2/__init__.py @@ -4,7 +4,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": (3, 2, 3), + "version": (3, 2, 4), '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 e9917c2a..8b9db89a 100644 --- a/io_scene_gltf2/blender/exp/gltf2_blender_image.py +++ b/io_scene_gltf2/blender/exp/gltf2_blender_image.py @@ -234,8 +234,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) |