X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_object.py;h=810d1cbfe42fc719878dc48580fa5b8b0b9a4083;hb=35f3540e50fdb9f45cd8e53cbe131610aa030a68;hp=9f1c1e581c286371c44b60918cb5f73d0e58c1c0;hpb=9d8e4aa5a9573b34fe06455af249c762433d47c0;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_object.py b/blender/io_mspgl/export_object.py
index 9f1c1e58..810d1cbf 100644
--- a/blender/io_mspgl/export_object.py
+++ b/blender/io_mspgl/export_object.py
@@ -34,15 +34,12 @@ class ObjectExporter:
 		self.separate_mesh = False
 		self.shared_mesh = True
 		self.separate_tech = False
-		self.external_tech = True
 		self.shared_tech = True
 		self.export_lods = True
 
-	def export(self, context, out_file, objs=None, progress=None):
-		if objs is None:
+	def export(self, context, out_file, obj=None, progress=None):
+		if obj is None:
 			obj = context.active_object
-		else:
-			obj = objs[0]
 
 		lods = [obj]
 		for c in obj.children:
@@ -71,10 +68,9 @@ class ObjectExporter:
 		for i, l in enumerate(lods):
 			if i>0:
 				out_file.begin("level_of_detail", i)
-				objs = [l]
 
 			if i==0 or l.data.name!=prev_mesh:
-				mesh = self.export_object_mesh(context, out_file, l, objs, progress)
+				mesh = self.export_object_mesh(context, out_file, l, progress)
 				prev_mesh = l.data.name
 
 			same_tech = True
@@ -83,7 +79,7 @@ class ObjectExporter:
 				mat = l.material_slots[0].material.name
 				if mat!=prev_tech[1]:
 					same_tech = False
-			if self.external_tech and l.technique!=prev_tech[0]:
+			if l.technique!=prev_tech[0]:
 				same_tech = False
 			if i==0 or not same_tech:
 				self.export_object_technique(l, mesh, out_file, i)
@@ -92,27 +88,27 @@ class ObjectExporter:
 			if i>0:
 				out_file.end()
 
-	def export_object_mesh(self, context, out_file, lod, objs, progress):
+	def export_object_mesh(self, context, out_file, obj, progress):
 		from .export_mesh import MeshExporter
 		mesh_export = MeshExporter()
 		for k, v in self.__dict__.items():
 			setattr(mesh_export, k, v)
 
 		lod_index = 0
-		if lod.lod_for_parent:
-			lod_index = lod.lod_index
+		if obj.lod_for_parent:
+			lod_index = obj.lod_index
 
 		if self.separate_mesh:
 			from .outfile import open_output
 			path, name = external_name(out_file, ".mesh", lod_index)
 			if self.shared_mesh:
-				name = lod.data.name+".mesh"
+				name = obj.data.name+".mesh"
 			mesh_out = open_output(os.path.join(path, name))
-			mesh = mesh_export.export(context, mesh_out, objs, progress)
+			mesh = mesh_export.export(context, mesh_out, obj, progress)
 			out_file.write("mesh", '"{}"'.format(name))
 		else:
 			out_file.begin("mesh")
-			mesh = mesh_export.export(context, out_file, objs, progress)
+			mesh = mesh_export.export(context, out_file, obj, progress)
 			out_file.end()
 
 		return mesh
@@ -125,7 +121,7 @@ class ObjectExporter:
 		from .outfile import open_output
 		path, name = external_name(out_file, ".tech", lod_index)
 
-		if self.external_tech and obj.technique:
+		if obj.technique:
 			if obj.inherit_tech and material and (obj.override_material or material.texture_slots):
 				out_file.begin("technique")
 				out_file.begin("inherit", '"{}"'.format(obj.technique))