diff options
| author | Julien Duroure <julien.duroure@gmail.com> | 2020-01-29 23:41:36 +0300 |
|---|---|---|
| committer | Julien Duroure <julien.duroure@gmail.com> | 2020-01-29 23:41:36 +0300 |
| commit | 5021c0955d8c57a76e15bedea834d012c653bf1c (patch) | |
| tree | dc3e16c44dc4472d6e31d9a3d542dcc2a10d211b /io_scene_gltf2 | |
| parent | 8696cf40470a6f16b8d414ba81d3727295ebb7bf (diff) | |
| parent | c8846a9e1a07b356523cc5e36227d469706fdc08 (diff) | |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'io_scene_gltf2')
| -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, 2 insertions, 4 deletions
diff --git a/io_scene_gltf2/__init__.py b/io_scene_gltf2/__init__.py index d75b4e97..25b4edcd 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, Norbert Nopper, Urs Hanselmann, Moritz Becher, Benjamin Schmithüsen, Jim Eckerlein, and many external contributors', - "version": (1, 2, 11), + "version": (1, 2, 12), 'blender': (2, 81, 6), '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 a21dcba5..30f913f8 100644 --- a/io_scene_gltf2/blender/exp/gltf2_blender_image.py +++ b/io_scene_gltf2/blender/exp/gltf2_blender_image.py @@ -286,6 +286,7 @@ class ExportImage: tmp_image = None try: tmp_image = image.copy() + tmp_image.update() if image.is_dirty: tmp_image.pixels = image.pixels[:] @@ -300,9 +301,6 @@ def _encode_temp_image(tmp_image: bpy.types.Image, file_format: str) -> bytes: tmpfilename = tmpdirname + '/img' tmp_image.filepath_raw = tmpfilename - # NOT A TYPO!!! If you delete this line, the - # assignment on the next line will not work. - tmp_image.file_format tmp_image.file_format = file_format tmp_image.save() |