X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_material.py;h=3f98620af879eb2109f66d02f0e0bc09917eb7cc;hb=694caa7d8ec0d62f22f185c94405aa1532c19e26;hp=c7ca765cb0736c9387c5742b0b9e76a3f0e7c106;hpb=be2d4eb0b735500a50d20ee2d9979c9f17d79e3a;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_material.py b/blender/io_mspgl/export_material.py
index c7ca765c..3f98620a 100644
--- a/blender/io_mspgl/export_material.py
+++ b/blender/io_mspgl/export_material.py
@@ -50,7 +50,7 @@ class MaterialExporter:
 				if p.texture:
 					tex_name = p.texture.image.name+".tex2d"
 					if tex_name not in resources:
-						resources[tex_name] = texture_export.export_texture(p.texture, p.tex_usage)
+						resources[tex_name] = texture_export.export_texture(p.texture, p.tex_usage, invert_green=p.invert_green)
 
 					samp_name = sampler_export.get_sampler_name(p.texture)
 					if samp_name not in resources:
@@ -67,24 +67,24 @@ class MaterialExporter:
 		return create_technique_resource(material, resources)
 
 	def export_material(self, material, *, resources):
-		from .datafile import Resource, Statement
+		from .datafile import Resource, Statement, Token
 		mat_res = Resource(material.name+".mat", "material")
 
 		if material.type!="pbr" and material.type!="unlit":
 			raise Exception("Can't export unknown material type "+material.type)
 
-		st = Statement(material.type)
+		mat_res.statements.append(Statement("type", Token(material.type)));
 		for p in material.properties:
-			ss = self.create_property_statement(mat_res, p, resources)
-			if ss:
-				st.sub.append(ss)
+			st = self.create_property_statement(mat_res, p, resources)
+			if st:
+				mat_res.statements.append(st)
 		if self.use_textures:
 			textures = [p.texture for p in material.properties if p.texture]
-			if textures and not textures[0].default_filter:
+			if textures and not all(t.default_filter for t in textures):
 				from .export_texture import SamplerExporter
+				sampler_tex = next(t for t in textures if not t.default_filter)
 				sampler_export = SamplerExporter()
-				st.sub.append(mat_res.create_reference_statement("sampler", resources[sampler_export.get_sampler_name(textures[0])]))
-		mat_res.statements.append(st)
+				mat_res.statements.append(mat_res.create_reference_statement("sampler", resources[sampler_export.get_sampler_name(sampler_tex)]))
 
 		return mat_res
 
@@ -134,10 +134,9 @@ class MaterialAtlasExporter:
 		mat_name = material_atlas.name+".mat"
 		if mat_name not in resources:
 			mat_res = Resource(mat_name, "material")
-			st = Statement("pbr")
-			st.sub.append(mat_res.create_reference_statement("base_color_map", base_color_res))
-			st.sub.append(mat_res.create_reference_statement("sampler", sampler_res))
-			mat_res.statements.append(st)
+			mat_res.statements.append(Statement("type", Token('pbr')))
+			mat_res.statements.append(mat_res.create_reference_statement("base_color_map", base_color_res))
+			mat_res.statements.append(mat_res.create_reference_statement("sampler", sampler_res))
 
 			resources[mat_name] = mat_res