Force the usage of normalmap as RGB data

[libs/gl.git] / blender / io_mspgl / material.py

diff --git a/blender/io_mspgl/material.py b/blender/io_mspgl/material.py
index 5e06fd8aa061ef83ca9540b1d97163657d0011be..e69cab844e3f2aa7cb4649eca55e2291e3da922f 100644 (file)
--- a/blender/io_mspgl/material.py
+++ b/blender/io_mspgl/material.py
@@ -30,8 +30,10 @@ class MaterialProperty:
                        from_node, _ = get_linked_node_and_socket(node_tree, input_socket)
                        alpha_from = None
                        if from_node:
+                               usage = None
                                if from_node.type=='NORMAL_MAP':
                                        from_node, _ = get_linked_node_and_socket(node_tree, from_node.inputs["Color"])
+                                       usage = 'RGB'
                                elif from_node.type=='RGBTOBW':
                                        from_node, _ = get_linked_node_and_socket(node_tree, from_node.inputs["Color"])
 
@@ -42,7 +44,9 @@ class MaterialProperty:
 
                                if from_node.type=='TEX_IMAGE':
                                        self.texture = from_node
-                                       if alpha_from:
+                                       if usage:
+                                               self.tex_usage = usage
+                                       elif alpha_from:
                                                self.tex_usage = 'RGBA'
                                        elif type(self.value)==tuple:
                                                self.tex_usage = 'RGB'
@@ -86,7 +90,7 @@ class Material:
                        base_color = self.create_property("base_color", (0.8, 0.8, 0.8, 1.0))
                        metalness = self.create_property("metalness", 0.0)
                        roughness = self.create_property("roughness", 0.5)
-                       normal = self.create_property("normal")
+                       normal = self.create_property("normal_map")
                        emission = self.create_property("emission", (0.0, 0.0, 0.0))
 
                        base_color.set_from_input(material.node_tree, surface_node.inputs["Base Color"], surface_node.inputs["Alpha"])