Rearrange type specification in material datafiles

[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 c7ca765cb0736c9387c5742b0b9e76a3f0e7c106..10be7dcba60057665792b7291ab550122901e3e7 100644 (file)
--- a/blender/io_mspgl/export_material.py
+++ b/blender/io_mspgl/export_material.py
@@ -67,24 +67,23 @@ 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:
                                from .export_texture import SamplerExporter
                                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(textures[0])]))
 
                return mat_res
 
@@ -134,10 +133,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