glTF exporter: materials: export factors from MULTIPLY nodes

1 files changed, 5 insertions, 4 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 3ad17fe2..0abe9256 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials.py
@@ -111,12 +111,13 @@ 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):
-        if emissive_socket.is_linked:
+        fac = gltf2_blender_get.get_factor_from_socket(emissive_socket, kind='RGB')
+        if fac is None and 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]
+            fac = [1.0, 1.0, 1.0]
+        if fac == [0, 0, 0]: fac = None
+        return fac
     return None