X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_texture.py;h=dd8191ce9f108652b2924ee1a77fbd0197d0f94c;hp=8c750ab9f73504493d09bd9d9138beba5837eb5e;hb=6ac405143184ff9f8e8114183a2d8f7b224d2779;hpb=0055fd43dc1d3b6ca65823f40dfdf78e65770f15

diff --git a/blender/io_mspgl/export_texture.py b/blender/io_mspgl/export_texture.py
index 8c750ab9..dd8191ce 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,29 +10,30 @@ 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)))
+		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
 			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))