X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_object.py;h=54bde96a5d29962f2ad9bac4279d0fe77d67a2ce;hp=70109753518b14723001048a4de275f5642e343f;hb=f241ccca7d0d3f3073a948377bd557a70aa8f1d2;hpb=9f8b7c740f3251ba5c6d94954431709d149aafae

diff --git a/blender/io_mspgl/export_object.py b/blender/io_mspgl/export_object.py
index 70109753..54bde96a 100644
--- a/blender/io_mspgl/export_object.py
+++ b/blender/io_mspgl/export_object.py
@@ -63,9 +63,9 @@ class ObjectExporter:
 				out_fn = os.path.join(path, obj.name+ext)
 
 			progress.push_task_slice(obj.name, i, len(objs))
-			self.export_object_resources(context, obj, resources, progress)
+			self.export_object_resources(context, obj, resources, None, progress)
 
-			obj_res = self.export_object(context, obj, progress, resources=resources)
+			obj_res = self.export_object(context, obj, resources, progress)
 			refs = obj_res.collect_references()
 			if not self.shared_resources:
 				numbers = {}
@@ -87,7 +87,7 @@ class ObjectExporter:
 
 			progress.pop_task()
 
-	def export_object_resources(self, context, obj, resources, progress, material_atlases=None):
+	def export_object_resources(self, context, obj, resources, material_atlases, progress):
 		if material_atlases is None:
 			material_atlases = {}
 
@@ -121,29 +121,29 @@ class ObjectExporter:
 				tech_name = "{}.tech".format(material_atlas.name)
 				if tech_name not in resources:
 					material_atlas_export.export_technique_resources(material_atlas, resources)
-					resources[tech_name] = material_atlas_export.export_technique(material_atlas, resources=resources)
+					resources[tech_name] = material_atlas_export.export_technique(material_atlas, resources)
 			elif l.material_slots and l.material_slots[0].material:
 				material = l.material_slots[0].material
 				if material.render_mode!='EXTERNAL':
 					tech_name = material.name+".tech"
 					if tech_name not in resources:
 						material_export.export_technique_resources(material, resources)
-						resources[tech_name] = material_export.export_technique(material, resources=resources)
+						resources[tech_name] = material_export.export_technique(material, resources)
 			elif "stub.tech" not in resources:
 				resources["stub.tech"] = self.export_stub_technique()
 
 			mesh_name = l.data.name+".mesh"
 			if mesh_name not in resources:
-				mesh = create_mesh_from_object(context, l, progress, material_atlas=material_atlas)
+				mesh = create_mesh_from_object(context, l, material_atlas, progress)
 				mesh_res = mesh_export.export_mesh(context, mesh, progress)
 				resources[mesh_name] = mesh_res
 
 			progress.pop_task()
 
-	def export_object(self, context, obj, progress, *, resources=None):
+	def export_object(self, context, obj, resources, progress):
 		if resources is None:
 			resources = {}
-			self.export_object_resources(context, obj, resources, progress)
+			self.export_object_resources(context, obj, resources, None, progress)
 
 		lods = self.collect_object_lods(obj)