Wrap material before passing it to create_technique_resource

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

diff --git a/blender/io_mspgl/export_object.py b/blender/io_mspgl/export_object.py
index 3ee06fc218c3fe1a618826eb22668b4687739e26..a8f55e92c34834a01ac0f17115b44b2d1343fd31 100644 (file)
--- a/blender/io_mspgl/export_object.py
+++ b/blender/io_mspgl/export_object.py
@@ -20,36 +20,23 @@ class ObjectExporter:
                lods += sorted([c for c in obj.children if c.lod_for_parent], key=(lambda l: l.lod_index))
                for i, l in enumerate(lods):
                        if i>0 and l.lod_index!=i:
-                               raise Exception("Inconsistent LOD indices")
+                               raise Exception("Invalid configuration on object {}: Inconsistent LOD indices".format(obj.name))
 
                return lods
 
-       def create_mesh_exporter(self):
-               from .export_mesh import MeshExporter
-               mesh_export = MeshExporter()
-               return mesh_export
-
-       def create_material_exporter(self):
-               from .export_material import MaterialExporter
-               material_export = MaterialExporter()
-               return material_export
-
-       def create_material_atlas_exporter(self):
-               from .export_material import MaterialAtlasExporter
-               material_atlas_export = MaterialAtlasExporter()
-               return material_atlas_export
-
        def export_object_resources(self, context, obj, resources, material_atlases, progress):
                if material_atlases is None:
                        material_atlases = {}
 
                lods = self.collect_object_lods(obj)
 
+               from .export_mesh import MeshExporter
+               from .export_material import MaterialAtlasExporter, MaterialExporter
                from .mesh import create_mesh_from_object
-               from .material import create_material_atlas
-               mesh_export = self.create_mesh_exporter()
-               material_export = self.create_material_exporter()
-               material_atlas_export = self.create_material_atlas_exporter()
+               from .material import Material, create_material_atlas
+               mesh_export = MeshExporter()
+               material_export = MaterialExporter()
+               material_atlas_export = MaterialAtlasExporter()
 
                for i, l in enumerate(lods):
                        lod_index = l.lod_index if l.lod_for_parent else 0
@@ -62,7 +49,7 @@ class ObjectExporter:
                                material_atlas_key = mmk(l.data.materials[0])
                                key_mismatch = any(mmk(m)!=material_atlas_key for m in l.data.materials)
                                if not all(atlas_flags) or key_mismatch:
-                                       raise Exception("Conflicting settings in object materials")
+                                       raise Exception("Invalid configuration on object {}: Mixed material atlas state")
 
                                if material_atlas_key in material_atlases:
                                        material_atlas = material_atlases[material_atlas_key]
@@ -79,6 +66,7 @@ class ObjectExporter:
                                if material.render_mode!='EXTERNAL':
                                        tech_name = material.name+".tech"
                                        if tech_name not in resources:
+                                               material = Material(material)
                                                material_export.export_technique_resources(material, resources)
                                                resources[tech_name] = material_export.export_technique(material, resources)
                        elif "stub.tech" not in resources:
@@ -94,7 +82,7 @@ class ObjectExporter:
 
        def export_object(self, obj, resources, progress):
                if obj.type!='MESH':
-                       raise ValueError("Object is not a mesh")
+                       raise ValueError("Object {} is not a mesh".format(obj.name))
 
                lods = self.collect_object_lods(obj)
 
@@ -148,11 +136,11 @@ class ObjectExporter:
                return obj_res
 
        def export_stub_technique(self):
-               from .datafile import Resource, Statement
+               from .datafile import Resource, Statement, Token
                tech_res = Resource("stub.tech", "technique")
-               pass_st = Statement("pass", "")
+               pass_st = Statement("method", "")
                tech_res.statements.append(pass_st)
                mat_st = Statement("material")
                pass_st.sub.append(mat_st)
-               mat_st.sub.append(Statement("basic"))
+               mat_st.sub.append(Statement("type", Token("basic")))
                return tech_res