X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_material.py;h=e7c1a50d49838523e3ae991d4c3c62952a7d4393;hb=c0b7d6ee4a7478f5aecb1504429ec1fc846d64ed;hp=d62276f76221bbcf3d89ea3e78aadc6040fd8599;hpb=6b9338845dfee441cd18ad6c633e4feef8ad14e1;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_material.py b/blender/io_mspgl/export_material.py
index d62276f7..e7c1a50d 100644
--- a/blender/io_mspgl/export_material.py
+++ b/blender/io_mspgl/export_material.py
@@ -7,7 +7,7 @@ def create_technique_resource(material, resources):
 
 	mat_res = resources[material.name+".mat"]
 
-	st = Statement("pass", "")
+	st = Statement("method", "")
 	if mat_res:
 		st.sub.append(tech_res.create_embed_statement("material", mat_res))
 
@@ -31,8 +31,14 @@ def create_technique_resource(material, resources):
 	tech_res.statements.append(st)
 
 	if material.shadow_method!='NONE':
-		st = Statement("pass", "shadow")
-		st.sub.append(Statement("shader", "_occluder.glsl.shader"))
+		st = Statement("method", "shadow")
+		if material.render_mode=='CUSTOM':
+			shader = material.shadow_shader or material.shader
+			if shader.endswith(".glsl"):
+				shader += ".shader"
+			st.sub.append(Statement("shader", shader))
+		else:
+			st.sub.append(Statement("shader", "_occluder.glsl.shader"))
 		tech_res.statements.append(st)
 
 	return tech_res
@@ -84,11 +90,10 @@ class MaterialExporter:
 			if st:
 				mat_res.statements.append(st)
 		textures = [p.texture for p in material.properties if p.texture]
-		if textures and not all(t.default_filter for t in textures):
+		if textures:
 			from .export_texture import SamplerExporter
-			sampler_tex = next(t for t in textures if not t.default_filter)
 			sampler_export = SamplerExporter()
-			mat_res.statements.append(mat_res.create_reference_statement("sampler", resources[sampler_export.get_sampler_name(sampler_tex)]))
+			mat_res.statements.append(mat_res.create_reference_statement("sampler", resources[sampler_export.get_sampler_name(textures[0])]))
 
 		return mat_res
 
@@ -97,11 +102,7 @@ class MaterialExporter:
 		if prop.texture:
 			tex_res = resources[prop.texture.image.name+".tex2d"]
 			from .util import basename
-			fn = basename(prop.texture.image.filepath)
-			if prop.texture.default_filter and fn:
-				return Statement(prop.tex_keyword, fn)
-			else:
-				return mat_res.create_reference_statement(prop.tex_keyword, tex_res)
+			return mat_res.create_reference_statement(prop.tex_keyword, tex_res)
 		elif not prop.keyword:
 			return
 		elif type(prop.value)==tuple: