Import fixes for exporter

[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 8c750ab9f73504493d09bd9d9138beba5837eb5e..c3c58c3b19e9ae3affab9830e95a3eec02b42762 100644 (file)
--- 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
@@ -20,17 +22,17 @@ class TextureExporter:
                        else:
                                tex_res.statements.append(Statement("min_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
                        if texture.use_alpha:
-                               fmt = 'RGBA'
+                               fmt = 'SRGB_ALPHA' if colorspace=='sRGB' else 'RGBA'
                                for p in texture.image.pixels:
                                        texdata += "\\x{:02X}".format(int(p*255))
                        else:
-                               fmt = 'RGB'
+                               fmt = 'SRGB' if colorspace=='sRGB' else 'RGB'
                                for i in range(0, len(texture.image.pixels), 4):
                                        for j in range(3):
                                                texdata += "\\x{:02X}".format(int(texture.image.pixels[i+j]*255))