Redesign the way shader programs are loaded

[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 266790f22d1dd4af80275e638c5565ebaf235c9b..41ed287bd3ab1c154ad146c2d760053ff9340455 100644 (file)
--- a/blender/io_mspgl/export_material.py
+++ b/blender/io_mspgl/export_material.py
@@ -11,7 +11,10 @@ def create_technique_resource(material, resources):
                st.sub.append(tech_res.create_embed_statement("material", mat_res))
 
        if material.render_mode=='CUSTOM':
-               st.sub.append(Statement("shader", material.shader))
+               shader = material.shader
+               if shader.endswith(".glsl"):
+                       shader += ".shader"
+               st.sub.append(Statement("shader", shader))
 
        tech_res.statements.append(st)
 
@@ -83,7 +86,8 @@ class MaterialExporter:
                from .datafile import Statement
                if self.use_textures and prop.texture:
                        tex_res = resources[prop.texture.image.name+".tex2d"]
-                       fn = os.path.basename(prop.texture.image.filepath)
+                       from .util import basename
+                       fn = basename(prop.texture.image.filepath)
                        if prop.texture.default_filter and fn:
                                return Statement(keyword+"_map", fn)
                        else: