diff options
| author | Julien Duroure <julien.duroure@gmail.com> | 2020-01-29 23:31:59 +0300 |
|---|---|---|
| committer | Julien Duroure <julien.duroure@gmail.com> | 2020-01-29 23:31:59 +0300 |
| commit | 8696cf40470a6f16b8d414ba81d3727295ebb7bf (patch) | |
| tree | d37c41b72e2a3f3e4131ce3abf2a7708d893ab82 /io_scene_gltf2 | |
| parent | 21dee6f89433249dba6573bf1eaa56a8d5b99c34 (diff) | |
| parent | a9e4f549520d325dd90916612d654c39375f3e92 (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/exp/gltf2_blender_gather_image.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/io_scene_gltf2/__init__.py b/io_scene_gltf2/__init__.py index c6574198..d75b4e97 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, 10), + "version": (1, 2, 11), '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_gather_image.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_image.py index ee184cdc..f6a9ef94 100755 --- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_image.py +++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_image.py @@ -160,6 +160,8 @@ def __get_image_data(sockets_or_slots, export_settings) -> ExportImage: 'G': Channel.G, 'B': Channel.B, }[elem.from_socket.name] + if elem.from_socket.name == 'Alpha': + src_chan = Channel.A dst_chan = None |