X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=blender%2Fio_mspgl%2Fmaterial.py;h=e69cab844e3f2aa7cb4649eca55e2291e3da922f;hp=f7f2c5eb6138d20099975259578cbc9100bdf81f;hb=b5a249d7f4dbbbf91c970993eb0eb949797c5565;hpb=5bf3c7175c359ad8509702a4e0790609b39e6aec

diff --git a/blender/io_mspgl/material.py b/blender/io_mspgl/material.py
index f7f2c5eb..e69cab84 100644
--- a/blender/io_mspgl/material.py
+++ b/blender/io_mspgl/material.py
@@ -30,8 +30,12 @@ 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"])
 
 				if alpha_socket:
 					alpha_from, _ = get_linked_node_and_socket(node_tree, alpha_socket)
@@ -40,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'
@@ -84,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"])