Remove default sampler from Texture

[libs/gl.git] / blender / io_mspgl / export_material.py

diff --git a/blender/io_mspgl/export_material.py b/blender/io_mspgl/export_material.py
index d62276f76221bbcf3d89ea3e78aadc6040fd8599..8a87011a25d93d1c54bb376c05ba02473488ab3e 100644 (file)
--- a/blender/io_mspgl/export_material.py
+++ b/blender/io_mspgl/export_material.py
@@ -32,7 +32,13 @@ def create_technique_resource(material, resources):
 
        if material.shadow_method!='NONE':
                st = Statement("pass", "shadow")
-               st.sub.append(Statement("shader", "_occluder.glsl.shader"))
+               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: