Improve logic for exporting material sampler references

[libs/gl.git] / blender / io_mspgl / export_material.py

diff --git a/blender/io_mspgl/export_material.py b/blender/io_mspgl/export_material.py
index 10be7dcba60057665792b7291ab550122901e3e7..3f98620af879eb2109f66d02f0e0bc09917eb7cc 100644 (file)
--- 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:
@@ -80,10 +80,11 @@ class MaterialExporter:
                                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()
-                               mat_res.statements.append(mat_res.create_reference_statement("sampler", resources[sampler_export.get_sampler_name(textures[0])]))
+                               mat_res.statements.append(mat_res.create_reference_statement("sampler", resources[sampler_export.get_sampler_name(sampler_tex)]))
 
                return mat_res