X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_scene.py;h=b2c3a2e671b6f12c8ded80ee8a1dbee098b9d7ed;hp=0ba4ad76945c734c3d6be7a3ce25f911c98c054c;hb=f241ccca7d0d3f3073a948377bd557a70aa8f1d2;hpb=9f8b7c740f3251ba5c6d94954431709d149aafae

diff --git a/blender/io_mspgl/export_scene.py b/blender/io_mspgl/export_scene.py
index 0ba4ad76..b2c3a2e6 100644
--- a/blender/io_mspgl/export_scene.py
+++ b/blender/io_mspgl/export_scene.py
@@ -81,7 +81,7 @@ class SceneExporter:
 			if r.name in export_names:
 				r.name = export_names[r.name]
 
-		scene_res = self.export_scene(context, objs, progress, prototypes=object_prototypes, resources=resources)
+		scene_res = self.export_scene(context, objs, resources, object_prototypes, progress)
 		refs = scene_res.collect_references()
 
 		if self.resource_collection:
@@ -107,12 +107,12 @@ class SceneExporter:
 
 		for i, o in enumerate(objs):
 			progress.push_task_slice(o.name, i, len(objs))
-			object_export.export_object_resources(context, o, resources, progress, material_atlases=material_atlases)
+			object_export.export_object_resources(context, o, resources, material_atlases, progress)
 			obj_name = o.name+".object"
-			resources[obj_name] = object_export.export_object(context, o, progress, resources=resources)
+			resources[obj_name] = object_export.export_object(context, o, resources, progress)
 			progress.pop_task()
 
-	def export_scene(self, context, objs, progress, *, prototypes, resources):
+	def export_scene(self, context, objs, resources, prototypes, progress):
 		from .datafile import Resource, Statement, Token
 		scene_res = Resource("scene.scene", "scene")