Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender-addons.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Duroure <julien.duroure@gmail.com>2019-02-27 20:18:11 +0300
committerJulien Duroure <julien.duroure@gmail.com>2019-02-27 20:18:11 +0300
commit82574a386e1ee717e34e960c529e21c8787e04e7 (patch)
treed19ec4d24076ac592008cb41a8949917d772f924 /io_scene_gltf2/blender/exp/gltf2_blender_gather_materials.py
parent45c7d47bf20697220df8a16c48858f4371584ef4 (diff)
glTF exporter: Fix emission factor exporting
Diffstat (limited to 'io_scene_gltf2/blender/exp/gltf2_blender_gather_materials.py')
-rwxr-xr-xio_scene_gltf2/blender/exp/gltf2_blender_gather_materials.py9
1 files changed, 7 insertions, 2 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 41bb7649..5fff246a 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials.py
@@ -103,8 +103,13 @@ def __gather_emissive_factor(blender_material, export_settings):
emissive_socket = gltf2_blender_get.get_socket_or_texture_slot(blender_material, "Emissive")
if emissive_socket is None:
emissive_socket = gltf2_blender_get.get_socket_or_texture_slot_old(blender_material, "EmissiveFactor")
- if isinstance(emissive_socket, bpy.types.NodeSocket) and not emissive_socket.is_linked:
- return list(emissive_socket.default_value)[0:3]
+ if isinstance(emissive_socket, bpy.types.NodeSocket):
+ if emissive_socket.is_linked:
+ # In glTF, the default emissiveFactor is all zeros, so if an emission texture is connected,
+ # we have to manually set it to all ones.
+ return [1.0, 1.0, 1.0]
+ else:
+ return list(emissive_socket.default_value)[0:3]
return None