X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=inline;f=blender%2Fio_mspgl%2Fexport_mesh.py;h=0bf7b83af6fb6be4581f0dcfcbebd04674ddc17b;hb=4cb7dfca6cf5b2b9fcffd0107181f0c5410adf87;hp=7b8fd771cd0ceab2c926a1be0db9cc3207745ab1;hpb=907a2aced4b7d70af6be0625632ba373c458f197;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_mesh.py b/blender/io_mspgl/export_mesh.py
index 7b8fd771..0bf7b83a 100644
--- a/blender/io_mspgl/export_mesh.py
+++ b/blender/io_mspgl/export_mesh.py
@@ -34,9 +34,7 @@ class MeshExporter:
 		progress.push_task("", 0.0, 0.95)
 		resource = self.export_mesh(context, obj, progress)
 
-		with open(out_fn, "w") as out_file:
-			for s in resource.statements:
-				s.write_to_file(out_file)
+		resource.write_to_file(out_fn)
 
 	def export_mesh(self, context, mesh_or_obj, progress):
 		from .mesh import Mesh, create_mesh_from_object
@@ -49,7 +47,7 @@ class MeshExporter:
 			progress.pop_task()
 
 		from .datafile import Resource, Statement, Token
-		resource = Resource(mesh.name+".mesh")
+		resource = Resource(mesh.name+".mesh", "mesh")
 		statements = resource.statements
 
 		st = Statement("vertices", Token("NORMAL3"))
@@ -113,19 +111,19 @@ 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)