Mark datafile tokens as such

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

diff --git a/blender/io_mspgl/export_mesh.py b/blender/io_mspgl/export_mesh.py
index bb116bda9133f3f8192e5ebfa0f42bc10ad046f1..e620b86f22ab9f0ebe155eb8ed50d3bcd9615789 100644 (file)
--- a/blender/io_mspgl/export_mesh.py
+++ b/blender/io_mspgl/export_mesh.py
@@ -32,10 +32,10 @@ class MeshExporter:
 
                progress = Progress(self.show_progress and context)
                progress.push_task("", 0.0, 0.95)
-               statements = self.export_mesh(context, obj, progress)
+               resource = self.export_mesh(context, obj, progress)
 
                with open(out_fn, "w") as out_file:
-                       for s in statements:
+                       for s in resource.statements:
                                s.write_to_file(out_file)
 
        def export_mesh(self, context, mesh_or_obj, progress):
@@ -48,9 +48,9 @@ class MeshExporter:
                        mesh = create_mesh_from_object(context, mesh_or_obj, progress)
                        progress.pop_task()
 
-               from .datafile import Statement, Token
-
-               statements = []
+               from .datafile import Resource, Statement, Token
+               resource = Resource(mesh.name+".mesh")
+               statements = resource.statements
 
                st = Statement("vertices", Token("NORMAL3"))
                if mesh.uv_layers:
@@ -113,20 +113,20 @@ class MeshExporter:
                                        st.sub.append(Statement("indices", *(v.index for v in s[i:i+32])))
                                statements.append(st)
                else:
-                       st = Statement("batch", "TRIANGLES")
+                       st = Statement("batch", Token('TRIANGLES'))
                        for f in mesh.faces:
                                st.sub.append(Statement("indices", *(v.index for v in f.vertices)))
                        statements.append(st)
 
                if mesh.lines:
-                       st = Statement("batch", "LINES")
+                       st = Statement("batch", Token('LINES'))
                        for l in mesh.lines:
                                st.sub.append(Statement("indices", *(v.index for v in l.vertices)))
                        statements.append(st)
 
                if mesh.winding_test:
-                       statements.append(Statement("winding", "COUNTERCLOCKWISE"))
+                       statements.append(Statement("winding", Token('COUNTERCLOCKWISE')))
 
                progress.set_progress(1.0)
 
-               return statements
+               return resource