X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_material.py;h=956f51d430b41acb8e48f2fdc42376971c2f3453;hp=c3aa654e41ed16ffb6a84e20b93e490f84fdac8e;hb=5be6340cbd5da619db56e1658da56840fcfd6293;hpb=405c00de24374c282adb1116551a833b8130d76d diff --git a/blender/io_mspgl/export_material.py b/blender/io_mspgl/export_material.py index c3aa654e..956f51d4 100644 --- a/blender/io_mspgl/export_material.py +++ b/blender/io_mspgl/export_material.py @@ -48,8 +48,8 @@ class MaterialExporter: st = Statement("inherit", material.technique) for s, t in textures.items(): - if t.default_filter: - st.sub.append(Statement("texture", s, image_name(t.image))) + if t.default_filter and t.image.filepath: + st.sub.append(Statement("texture", s, os.path.basename(t.image.filepath))) else: st.sub.append(tech_res.create_reference_statement("texture", s, resources[t.name+".tex2d"])) if material.override_material: @@ -68,10 +68,10 @@ class MaterialExporter: ss = Statement("texunit", 0) if self.single_file: ss.sub.append(tech_res.create_embed_statement("texture2d", tex_res)) - elif not diffuse_tex.default_filter: - ss.sub.append(tech_res.create_reference_statement("texture", tex_res)) + elif diffuse_tex.default_filter and diffuse_tex.image.filepath: + ss.sub.append(Statement("texture", os.path.basename(diffuse_tex.image.filepath))) else: - ss.sub.append(Statement("texture", image_name(diffuse_tex.image))) + ss.sub.append(tech_res.create_reference_statement("texture", tex_res)) st.sub.append(ss) tech_res.statements.append(st)