X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=blender%2Fio_mspgl%2Fmaterial.py;h=519154449c25da11c7025784e9bae70e980705e5;hb=dcc5ed277f3caf8ed0298f72284c0cf5c8cc6361;hp=87e9479bbc676c309495d39b527a1c1848bef6f4;hpb=563f11dd3e08263c8094c124c862fb6a398708f2;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/material.py b/blender/io_mspgl/material.py
index 87e9479b..51915444 100644
--- a/blender/io_mspgl/material.py
+++ b/blender/io_mspgl/material.py
@@ -57,9 +57,7 @@ def check_additive_blend(node_tree, node):
 def get_unlit_inputs(node_tree, node, additive):
 	from .util import get_linked_node_and_socket
 
-	if node.type=='GROUP':
-		return check_group(node_tree, node, get_unlit_inputs)
-	elif node.type=='MIX_SHADER' and not additive:
+	if node.type=='MIX_SHADER' and not additive:
 		shader1, _ = get_linked_node_and_socket(node_tree, node.inputs[1])
 		shader2, _ = get_linked_node_and_socket(node_tree, node.inputs[2])
 		if shader1.type=='BSDF_TRANSPARENT' and shader2.type=='EMISSION':
@@ -89,8 +87,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 +105,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 +124,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)