X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_material.py;h=4941a5851d1b34592e567f80c08cb33af0e919fd;hb=1ced0f1993471e4cf8789186edc57f8f900d9b6c;hp=ffdae1cc7f782cd65ffc2781178e389f3a11fec7;hpb=1ebae998eb54c3f33900dc76de3b34c2d5252e58;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_material.py b/blender/io_mspgl/export_material.py
index ffdae1cc..4941a585 100644
--- a/blender/io_mspgl/export_material.py
+++ b/blender/io_mspgl/export_material.py
@@ -77,7 +77,7 @@ class MaterialExporter:
 		for p in textured_props:
 			ctx.next_slice(p.texture.image)
 
-			tex_name = p.texture.image.name+".tex2d"
+			tex_name = p.texture.image.name+".tex"
 			if tex_name not in resources:
 				resources[tex_name] = texture_export.export_texture(p.texture, p.tex_channels)
 
@@ -123,8 +123,7 @@ class MaterialExporter:
 	def create_property_statement(self, mat_res, prop, resources):
 		from .datafile import Statement
 		if prop.texture:
-			tex_res = resources[prop.texture.image.name+".tex2d"]
-			from .util import basename
+			tex_res = resources[prop.texture.image.name+".tex"]
 			return mat_res.create_reference_statement(prop.tex_keyword, tex_res)
 		elif not prop.keyword:
 			return
@@ -140,11 +139,12 @@ class MaterialAtlasExporter:
 
 	def export_technique_resources(self, material_atlas, resources):
 		from .datafile import Resource, Statement, Token
-		base_color_name = material_atlas.name+"_base_color.tex2d"
+		base_color_name = material_atlas.name+"_base_color.tex"
 		base_color_res = resources.get(base_color_name)
 		if not base_color_res:
-			base_color_res = Resource(base_color_name, "texture2d")
+			base_color_res = Resource(base_color_name, "texture")
 
+			base_color_res.statements.append(Statement("type", Token("\\2d")))
 			base_color_res.statements.append(Statement("storage", Token('SRGB_ALPHA'), *material_atlas.size))
 			base_color_res.statements.append(Statement("raw_data", material_atlas.base_color_data))