X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_texture.py;h=c304fd7e471ffd344da316712db29b984272ed01;hb=308dc6b8f5ee1aa3bb8f205e2ed6464749eebbe5;hp=3d21cd1a796a77d540cda19ff72ba39179509ea6;hpb=be92396630a2065e43c21d9d1904e97014844cff;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_texture.py b/blender/io_mspgl/export_texture.py
index 3d21cd1a..c304fd7e 100644
--- a/blender/io_mspgl/export_texture.py
+++ b/blender/io_mspgl/export_texture.py
@@ -2,10 +2,6 @@ import os
 import base64
 import codecs
 
-def encode_pixels(pixels):
-	from .datafile import Token
-	return Token(codecs.decode(b"="+base64.b64encode(bytes(pixels))+b"=", "ascii"))
-
 def pixels_to_rgba(pixels):
 	return (int(p*255) for p in pixels)
 
@@ -28,7 +24,7 @@ def pixels_to_gray(pixels):
 class TextureExporter:
 	def export_texture(self, tex_node, usage='RGB', *, invert_green=False):
 		image = tex_node.image
-		from .datafile import Resource, Statement, Token
+		from .datafile import RawData, Resource, Statement, Token
 		tex_res = Resource(image.name+".tex", "texture")
 
 		tex_res.statements.append(Statement("type", Token("\\2d")))
@@ -43,6 +39,8 @@ class TextureExporter:
 		from .util import basename
 		fn = basename(image.filepath)
 		if not invert_green and fn:
+			if not tex_node.use_mipmap:
+				tex_res.statements.append(Statement("mipmap_levels", 1))
 			srgb = "_srgb" if colorspace=='sRGB' else ""
 			tex_res.statements.append(Statement("external_image"+srgb, fn))
 		else:
@@ -58,14 +56,16 @@ class TextureExporter:
 			pixels = tuple(image.pixels)
 			texdata = ""
 			if usage=='RGBA':
-				texdata = encode_pixels(pixels_to_rgba(pixels))
+				texdata = pixels_to_rgba(pixels)
 			elif usage=='GRAY':
-				texdata = encode_pixels(pixels_to_gray(pixels))
+				texdata = pixels_to_gray(pixels)
 			elif invert_green:
-				texdata = encode_pixels(pixels_to_rgb_invert_green(pixels))
+				texdata = pixels_to_rgb_invert_green(pixels)
 			else:
-				texdata = encode_pixels(pixels_to_rgb(pixels))
-			tex_res.statements.append(Statement("raw_data", texdata))
+				texdata = pixels_to_rgb(pixels)
+
+			data = RawData(image.name+".mdr", bytes(texdata))
+			tex_res.statements.append(tex_res.create_reference_statement("external_data", data))
 
 		return tex_res