diff options
author | Julien Duroure <julien.duroure@gmail.com> | 2020-01-24 18:59:33 +0300 |
---|---|---|
committer | Julien Duroure <julien.duroure@gmail.com> | 2020-01-24 18:59:33 +0300 |
commit | 96e3c6f25dd25aed234943eb25ab255399598865 (patch) | |
tree | ff8e6895f51887e09b4047533fc59050f2161e07 /io_scene_gltf2 | |
parent | 81ed56cbce99c9991c989163c802b4cea42be58e (diff) | |
parent | 2f208187759ff860d326d0da464dac8336f6c5b9 (diff) |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'io_scene_gltf2')
-rwxr-xr-x | io_scene_gltf2/__init__.py | 2 | ||||
-rwxr-xr-x | io_scene_gltf2/blender/imp/gltf2_blender_image.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/io_scene_gltf2/__init__.py b/io_scene_gltf2/__init__.py index 9410cd1d..de9ca423 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, 6), + "version": (1, 2, 7), 'blender': (2, 81, 6), 'location': 'File > Import-Export', 'description': 'Import-Export as glTF 2.0', diff --git a/io_scene_gltf2/blender/imp/gltf2_blender_image.py b/io_scene_gltf2/blender/imp/gltf2_blender_image.py index c64fa5a0..68ac1338 100755 --- a/io_scene_gltf2/blender/imp/gltf2_blender_image.py +++ b/io_scene_gltf2/blender/imp/gltf2_blender_image.py @@ -92,7 +92,7 @@ class BlenderImage(): # Create a temp image, pack, and delete image tmp_image = tempfile.NamedTemporaryFile(delete=False) img_data, img_name = BinaryData.get_image_data(gltf, img_idx) - if img_name is not None: + if img_data is not None: tmp_image.write(img_data) tmp_image.close() |