X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_texture.py;h=9f520cbd7dea5edac5c8cdb690cc8cedd037d9bb;hp=23c5777d39ce4b2e92401bacda2ebc0da4e74c68;hb=6a832fe1771f8c7bca0faa0d383fbbab062a1c56;hpb=b130e82b37b033fdfb020ebc82a473df2d9d3db5

diff --git a/blender/io_mspgl/export_texture.py b/blender/io_mspgl/export_texture.py
index 23c5777d..9f520cbd 100644
--- a/blender/io_mspgl/export_texture.py
+++ b/blender/io_mspgl/export_texture.py
@@ -1,3 +1,5 @@
+import os
+
 class TextureExporter:
 	def __init__(self):
 		self.inline_data = True
@@ -8,21 +10,20 @@ class TextureExporter:
 
 		if texture.use_interpolation:
 			if texture.use_mipmap:
-				tex_res.statements.append(Statement("min_filter", Token('LINEAR_MIPMAP_LINEAR')))
+				tex_res.statements.append(Statement("filter", Token('LINEAR_MIPMAP_LINEAR')))
 				tex_res.statements.append(Statement("generate_mipmap", True))
 			else:
-				tex_res.statements.append(Statement("min_filter", Token('LINEAR')))
+				tex_res.statements.append(Statement("filter", Token('LINEAR')))
 			tex_res.statements.append(Statement("max_anisotropy", texture.filter_eccentricity))
 		else:
 			if texture.use_mipmap:
-				tex_res.statements.append(Statement("min_filter", Token('NEAREST_MIPMAP_NEAREST')))
+				tex_res.statements.append(Statement("filter", Token('NEAREST_MIPMAP_NEAREST')))
 				tex_res.statements.append(Statement("generate_mipmap", True))
 			else:
-				tex_res.statements.append(Statement("min_filter", Token('NEAREST')))
+				tex_res.statements.append(Statement("filter", Token('NEAREST')))
 
-		if not self.inline_data:
-			from .util import image_name
-			tex_res.statements.append(Statement("external_image", image_name(texture.image)))
+		if not self.inline_data and texture.image.filepath:
+			tex_res.statements.append(Statement("external_image", os.path.basename(texture.image.filepath)))
 		else:
 			texdata = ""
 			colorspace = texture.image.colorspace_settings.name