Merge branch 'blender-v2.82-release'

This commit is contained in:
Julien Duroure 2020-01-29 21:41:36 +01:00
commit 5021c0955d
2 changed files with 2 additions and 4 deletions

View File

@ -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',

View File

@ -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()