X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_texture.py;h=2269e27ae175a514670c70a295aaada994228dbb;hb=5593d59bfe30fd7eecc55bc3580d87fcb91f0248;hp=2860d461d8874efd708b3e424332dbd42aaf2da3;hpb=893c0645802c46eb60b04a87e79a5a4d69e32ea2;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_texture.py b/blender/io_mspgl/export_texture.py
index 2860d461..2269e27a 100644
--- a/blender/io_mspgl/export_texture.py
+++ b/blender/io_mspgl/export_texture.py
@@ -38,9 +38,8 @@ class TextureExporter:
 		if tex_node.use_mipmap:
 			tex_res.statements.append(Statement("generate_mipmap", True))
 
-		colorspace = image.colorspace_settings.name
-		if len(channels)==1 and colorspace=='sRGB':
-			raise Exception("Unsupported configuration on texture {}: Grayscale with sRGB".format(image.name))
+		from .texture import Texture
+		texture = Texture(tex_node, channels)
 
 		invert_mask = sum(1<<i for i, c in enumerate(channels) if c[0]=='~')
 
@@ -61,17 +60,10 @@ class TextureExporter:
 		if not invert_mask and channels==native_channels:
 			if not tex_node.use_mipmap:
 				tex_res.statements.append(Statement("mipmap_levels", 1))
-			srgb = "_srgb" if colorspace=='sRGB' else ""
+			srgb = "_srgb" if texture.srgb else ""
 			tex_res.statements.append(Statement("external_image"+srgb, fn))
 		else:
-			if len(channels)==4:
-				fmt = 'SRGB8_ALPHA8' if colorspace=='sRGB' else 'RGBA8'
-			elif len(channels)==1:
-				fmt = 'LUMINANCE8'
-			else:
-				fmt = 'SRGB8' if colorspace=='sRGB' else 'RGB8'
-
-			tex_res.statements.append(Statement("storage", Token(fmt), image.size[0], image.size[1]))
+			tex_res.statements.append(Statement("storage", Token(texture.pixelformat), texture.width, texture.height))
 
 			pixels = tuple(image.pixels)
 			texdata = ""