X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fmaterial.py;h=88e251b8d7d4f9cd4e569a956a82286a332ddfb8;hb=9b371e56adc1d6be89f2d30881c3759a0d5f8eca;hp=eb4c7c2444b18da82b6318585ff098b5f2af9e05;hpb=08942dd73918a51baefbe7344b62afc0cad42e55;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/material.py b/blender/io_mspgl/material.py
index eb4c7c24..88e251b8 100644
--- a/blender/io_mspgl/material.py
+++ b/blender/io_mspgl/material.py
@@ -39,6 +39,25 @@ def check_invert_green(node_tree, node):
 
 	return get_linked_node_and_socket(node_tree, red.inputs["Image"])
 
+def get_unlit_inputs(node_tree, node):
+	if node.type=='GROUP':
+		return check_group(node_tree, node, get_unlit_inputs)
+	elif node.type=='MIX_SHADER':
+		from .util import get_linked_node_and_socket
+
+		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':
+			factor_input = node.inputs["Fac"]
+			factor_from, _ = get_linked_node_and_socket(node_tree, factor_input)
+			color_input = shader2.inputs["Color"]
+			color_from, _ = get_linked_node_and_socket(node_tree, color_input)
+			if factor_from==color_from:
+				return (color_input, factor_input)
+	elif node.type=='EMISSION':
+		return (node.inputs["Color"], None)
+	return (None, None)
+
 class MaterialProperty:
 	def __init__(self, keyword, tex_keyword, value):
 		self.keyword = keyword
@@ -102,8 +121,10 @@ class Material:
 		self.render_mode = material.render_mode
 		self.technique = material.technique
 		self.render_methods = material.render_methods[:]
+		self.uniforms = material.uniforms[:]
 		self.receive_shadows = material.receive_shadows
 		self.cast_shadows = (material.shadow_method!='NONE')
+		self.blended = (material.blend_method=='BLEND')
 		self.image_based_lighting = material.image_based_lighting
 
 		if self.render_mode=='EXTERNAL' and not self.technique:
@@ -136,12 +157,16 @@ class Material:
 			roughness.set_from_input(material.node_tree, surface_node.inputs["Roughness"])
 			normal.set_from_input(material.node_tree, surface_node.inputs["Normal"])
 			emission.set_from_input(material.node_tree, surface_node.inputs["Emission"])
-		elif surface_node.type=='EMISSION':
+		elif surface_node.type=='EMISSION' or surface_node.type=='MIX_SHADER':
+			color_input, alpha_input = get_unlit_inputs(material.node_tree, surface_node)
+			if not color_input:
+				raise Exception("Unsupported configuration for unlit material {}".format(self.name))
+
 			self.type = "unlit"
 
 			color = self.create_property("color", "texture", (1.0, 1.0, 1.0, 1.0))
 
-			color.set_from_input(material.node_tree, surface_node.inputs["Color"])
+			color.set_from_input(material.node_tree, color_input, alpha_input)
 		else:
 			raise Exception("Unsupported surface node type {} on material {}".format(surface_node.type, self.name))