X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_texture.py;h=3d21cd1a796a77d540cda19ff72ba39179509ea6;hb=be92396630a2065e43c21d9d1904e97014844cff;hp=8e3872b5c8646f1084c83324b73f15499c9d9e9a;hpb=d962add24cb7e55fa30b63763b4dbf7f37af0079;p=libs%2Fgl.git diff --git a/blender/io_mspgl/export_texture.py b/blender/io_mspgl/export_texture.py index 8e3872b5..3d21cd1a 100644 --- a/blender/io_mspgl/export_texture.py +++ b/blender/io_mspgl/export_texture.py @@ -26,24 +26,23 @@ def pixels_to_gray(pixels): yield int((pixels[i]+pixels[i+1]+pixels[i+2])*255/3) class TextureExporter: - def __init__(self): - self.inline_data = True - def export_texture(self, tex_node, usage='RGB', *, invert_green=False): image = tex_node.image from .datafile import Resource, Statement, Token - tex_res = Resource(image.name+".tex2d", "texture2d") + tex_res = Resource(image.name+".tex", "texture") + + tex_res.statements.append(Statement("type", Token("\\2d"))) if tex_node.use_mipmap: tex_res.statements.append(Statement("generate_mipmap", True)) colorspace = image.colorspace_settings.name if usage=='GRAY' and colorspace=='sRGB': - raise Exception("Grayscale textures with sRGB colorspace are not supported") + raise Exception("Unsupported configuration on texture {}: Grayscale with sRGB".format(image.name)) from .util import basename fn = basename(image.filepath) - if not self.inline_data and not invert_green and fn: + if not invert_green and fn: srgb = "_srgb" if colorspace=='sRGB' else "" tex_res.statements.append(Statement("external_image"+srgb, fn)) else: