Better checking of the existence of image filepath

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

diff --git a/blender/io_mspgl/export_texture.py b/blender/io_mspgl/export_texture.py
index 0a43ce624cfb296348e9a08c2cf4ada186f8068f..dd8191ce9f108652b2924ee1a77fbd0197d0f94c 100644 (file)
--- a/blender/io_mspgl/export_texture.py
+++ b/blender/io_mspgl/export_texture.py
@@ -10,21 +10,21 @@ 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 and texture.image.filepath:
-                       from .util import image_name
-                       tex_res.statements.append(Statement("external_image", os.path.basename(texture.image.filepath)))
+               fn = os.path.basename(texture.image.filepath)
+               if not self.inline_data and fn:
+                       tex_res.statements.append(Statement("external_image", fn))
                else:
                        texdata = ""
                        colorspace = texture.image.colorspace_settings.name