Redesign progress and error reporting in the Blender exporter

[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 826ab92688429e69cf5b735c06227674fa8fbd64..a109ed24351f2782093cf70ab792654f69ba53eb 100644 (file)
--- a/blender/io_mspgl/export_material.py
+++ b/blender/io_mspgl/export_material.py
@@ -62,7 +62,7 @@ def create_technique_resource(material, resources):
        return tech_res
 
 class MaterialExporter:
-       def export_technique_resources(self, material, resources):
+       def export_technique_resources(self, ctx, material, resources):
                from .export_texture import SamplerExporter, TextureExporter
                texture_export = TextureExporter()
                sampler_export = SamplerExporter()
@@ -71,16 +71,21 @@ class MaterialExporter:
                if type(material)!=Material:
                        material = Material(material)
 
-               for p in material.properties:
-                       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, invert_green=p.invert_green)
+               textured_props = [p for p in material.properties if p.texture]
+
+               ctx.set_slices(len(textured_props)+1)
+               for p in textured_props:
+                       ctx.next_slice(p.texture.image)
+
+                       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, invert_green=p.invert_green)
 
-                               samp_name = sampler_export.get_sampler_name(p.texture)
-                               if samp_name not in resources:
-                                       resources[samp_name] = sampler_export.export_sampler(p.texture)
+                       samp_name = sampler_export.get_sampler_name(p.texture)
+                       if samp_name not in resources:
+                               resources[samp_name] = sampler_export.export_sampler(p.texture)
 
+               ctx.next_slice(material)
                mat_name = material.name+".mat"
                if mat_name not in resources:
                        if material.type: