Rename RenderPass to RenderMethod

[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 2d85b10f3c7c4b26aa9e45803b0ca2af7d9134eb..e7c1a50d49838523e3ae991d4c3c62952a7d4393 100644 (file)
--- 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,7 +31,7 @@ def create_technique_resource(material, resources):
        tech_res.statements.append(st)
 
        if material.shadow_method!='NONE':
-               st = Statement("pass", "shadow")
+               st = Statement("method", "shadow")
                if material.render_mode=='CUSTOM':
                        shader = material.shadow_shader or material.shader
                        if shader.endswith(".glsl"):
@@ -90,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
 
@@ -103,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: