X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=blender%2Fio_mspgl%2Fmaterial.py;h=b30a2ef5d90fef6e7ec1aa1337d6fa5002661136;hp=bb8bd80bf68a0778ba2f2fe70c4bc1762c1fe451;hb=1ebae998eb54c3f33900dc76de3b34c2d5252e58;hpb=9656026f49b0063e035825fec2a96e17b6de93af

diff --git a/blender/io_mspgl/material.py b/blender/io_mspgl/material.py
index bb8bd80b..b30a2ef5 100644
--- a/blender/io_mspgl/material.py
+++ b/blender/io_mspgl/material.py
@@ -27,13 +27,13 @@ def check_invert_green(node_tree, node):
 
 	from .util import get_linked_node_and_socket
 
-	green, g_sock = get_linked_node_and_socket(node_tree, node.inputs["G"])
+	green, _ = get_linked_node_and_socket(node_tree, node.inputs["G"])
 	if not green or green.type!='MATH' or green.operation!='SUBTRACT':
 		return (None, None)
-	green, g_sock = get_linked_node_and_socket(node_tree, green.inputs[1])
+	green, _ = get_linked_node_and_socket(node_tree, green.inputs[1])
 
-	red, r_sock = get_linked_node_and_socket(node_tree, node.inputs["R"])
-	blue, b_sock = get_linked_node_and_socket(node_tree, node.inputs["B"])
+	red, _ = get_linked_node_and_socket(node_tree, node.inputs["R"])
+	blue, _ = get_linked_node_and_socket(node_tree, node.inputs["B"])
 	if not red or red.type!='SEPRGB' or blue!=red or green!=red:
 		return (None, None)
 
@@ -89,8 +89,7 @@ class MaterialProperty:
 		self.tex_keyword = tex_keyword
 		self.value = value
 		self.texture = None
-		self.tex_usage = None
-		self.invert_green = False
+		self.tex_channels = None
 
 	def set_from_input(self, node_tree, input_socket, alpha_socket=None):
 		if self.keyword:
@@ -108,16 +107,17 @@ class MaterialProperty:
 			from_node, _ = get_linked_node_and_socket(node_tree, input_socket)
 			alpha_from = None
 			if from_node:
-				usage = None
+				channels = None
 				if from_node.type=='NORMAL_MAP':
 					from_node, _ = get_linked_node_and_socket(node_tree, from_node.inputs["Color"])
 					invert, _ = check_invert_green(node_tree, from_node)
+					channels = ['R', 'G', 'B']
 					if invert:
 						from_node = invert
-						self.invert_green = True
-					usage = 'RGB'
+						channels[1] = '~G';
 				elif from_node.type=='RGBTOBW':
 					from_node, _ = get_linked_node_and_socket(node_tree, from_node.inputs["Color"])
+					channels = ['Y']
 
 				if alpha_socket:
 					alpha_from, _ = get_linked_node_and_socket(node_tree, alpha_socket)
@@ -126,14 +126,14 @@ class MaterialProperty:
 
 				if from_node.type=='TEX_IMAGE':
 					self.texture = from_node
-					if usage:
-						self.tex_usage = usage
+					if channels:
+						self.tex_channels = channels
 					elif alpha_from:
-						self.tex_usage = 'RGBA'
+						self.tex_channels = ['R', 'G', 'B', 'A']
 					elif type(self.value)==tuple:
-						self.tex_usage = 'RGB'
+						self.tex_channels = ['R', 'G', 'B']
 					else:
-						self.tex_usage = 'GRAY'
+						self.tex_channels = ['Y']
 				else:
 					raise Exception("Unsupported property input node type "+from_node.type)