X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fmaterial.py;h=7299e636ea7a6e2682dd52dd4051e64df72b505b;hb=6b9338845dfee441cd18ad6c633e4feef8ad14e1;hp=ba5fc3e2c6cb7567b0563b391cf8d4a3c0c21cf2;hpb=160293feec7b0b976856685153cd24c7f1ce9492;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/material.py b/blender/io_mspgl/material.py
index ba5fc3e2..7299e636 100644
--- a/blender/io_mspgl/material.py
+++ b/blender/io_mspgl/material.py
@@ -1,14 +1,8 @@
 import os
 
-def get_linked_node_and_socket(node_tree, socket):
-	for l in node_tree.links:
-		if socket==l.to_socket:
-			return (l.from_node, l.from_socket)
-		elif socket==l.from_socket:
-			return (l.to_node, l.to_socket)
-	return (None, None)
-
 def check_group(node_tree, group, func):
+	from .util import get_linked_node_and_socket
+
 	output = group.node_tree.nodes["Group Output"]
 	from_node, _ = get_linked_node_and_socket(group.node_tree, output.inputs[0])
 	if from_node:
@@ -23,6 +17,8 @@ def check_invert_green(node_tree, node):
 	elif node.type!='COMBRGB':
 		return (None, None)
 
+	from .util import get_linked_node_and_socket
+
 	green, g_sock = get_linked_node_and_socket(node_tree, node.inputs["G"])
 	if not green or green.type!='MATH' or green.operation!='SUBTRACT':
 		return (None, None)
@@ -55,6 +51,8 @@ class MaterialProperty:
 				self.value = input_socket.default_value
 
 		if self.tex_keyword:
+			from .util import get_linked_node_and_socket
+
 			from_node, _ = get_linked_node_and_socket(node_tree, input_socket)
 			alpha_from = None
 			if from_node:
@@ -96,21 +94,21 @@ class Material:
 		self.render_mode = material.render_mode
 		self.technique = material.technique
 		self.shader = material.shader
+		self.receive_shadows = material.receive_shadows
+		self.cast_shadows = (material.shadow_method!='NONE')
+		self.image_based_lighting = material.image_based_lighting
 
 		if self.render_mode=='EXTERNAL' and not self.technique:
 			raise Exception("Invalid configuration on material {}: No technique for external rendering".format(self.name))
 		elif self.render_mode=='CUSTOM' and not self.shader:
 			raise Exception("Invalid configuration on material {}: No shader for custom rendering".format(self.name))
 
-		out_node = None
-		for n in material.node_tree.nodes:
-			if n.type=='OUTPUT_MATERIAL':
-				out_node = n
-				break
-
+		out_node = next((n for n in material.node_tree.nodes if n.type=='OUTPUT_MATERIAL'), None)
 		if not out_node:
 			raise Exception("No output node found on material {}".format(self.name))
 
+		from .util import get_linked_node_and_socket
+
 		surface_node, _ = get_linked_node_and_socket(material.node_tree, out_node.inputs["Surface"])
 		if not surface_node:
 			if self.render_mode=='BUILTIN':
@@ -171,6 +169,8 @@ class MaterialAtlas:
 			self.name = "material_atlas_"+os.path.splitext(self.shader)[0]
 		else:
 			self.name = "material_atlas"
+		self.receive_shadows = materials[0].receive_shadows
+		self.cast_shadows = (materials[0].shadow_method!='NONE')
 		self.materials = materials
 		self.material_names = [m.name for m in self.materials]
 		for m in self.materials:
@@ -178,6 +178,8 @@ class MaterialAtlas:
 				raise Exception("Conflicting render modes in MaterialAtlas constructor")
 			if self.render_mode=='CUSTOM' and m.shader!=self.shader:
 				raise Exception("Conflicting shaders in MaterialAtlas constructor")
+			if m.receive_shadows!=self.receive_shadows or m.shadow_method!=materials[0].shadow_method:
+				raise Exception("Conflicting shadow settings in MaterialAtlas constructor")
 
 		count = len(self.materials)
 		size = 1