diff options
| author | Julien Duroure <julien.duroure@gmail.com> | 2022-02-12 16:07:32 +0300 |
|---|---|---|
| committer | Julien Duroure <julien.duroure@gmail.com> | 2022-02-12 16:07:32 +0300 |
| commit | 2fab0283474d136201bf2b8f947e8f96fa71b838 (patch) | |
| tree | 0c98511b2d9cc27a569d673e6bd295d9e5fd6dd6 /io_scene_gltf2/blender/exp/gltf2_blender_gather_materials.py | |
| parent | 693a5d4fa7eefafe322d3494245443d7978345ba (diff) | |
| parent | 4003baf03d7d6d78ef4c16be79c73edadf87759c (diff) | |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'io_scene_gltf2/blender/exp/gltf2_blender_gather_materials.py')
| -rwxr-xr-x | io_scene_gltf2/blender/exp/gltf2_blender_gather_materials.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials.py index a3f8423c..2d83b0dd 100755 --- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials.py +++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials.py @@ -103,7 +103,10 @@ def __gather_emissive_factor(blender_material, export_settings): if emissive_socket is None: emissive_socket = gltf2_blender_get.get_socket_old(blender_material, "EmissiveFactor") if isinstance(emissive_socket, bpy.types.NodeSocket): - factor = gltf2_blender_get.get_factor_from_socket(emissive_socket, kind='RGB') + if export_settings['gltf_image_format'] != "NONE": + factor = gltf2_blender_get.get_factor_from_socket(emissive_socket, kind='RGB') + else: + factor = gltf2_blender_get.get_const_from_default_value_socket(emissive_socket, kind='RGB') if factor is None and emissive_socket.is_linked: # In glTF, the default emissiveFactor is all zeros, so if an emission texture is connected, |