X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_object.py;h=2d2c25ed8013369c74661ba7b1f3c6b087193bec;hb=42c1534d95e1551c37e64a1dae288e8b75e8d8ba;hp=b911ed362bb242bc84f7f040a7ac25b90ac3e99a;hpb=84269f7b598673b06757313d70934a1747045b69;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_object.py b/blender/io_mspgl/export_object.py
index b911ed36..2d2c25ed 100644
--- a/blender/io_mspgl/export_object.py
+++ b/blender/io_mspgl/export_object.py
@@ -28,6 +28,7 @@ class ObjectExporter:
 		self.srgb_colors = True
 		self.textures = "REF"
 		self.separate_mesh = False
+		self.shared_mesh = True
 		self.separate_tech = False
 		self.external_tech = True
 		self.shared_tech = True
@@ -68,9 +69,8 @@ class ObjectExporter:
 				out_file.begin("level_of_detail", i)
 				objs = [l]
 
-			same_mesh = (l.data.name==prev_mesh)
-			if i==0 or not same_mesh:
-				mesh = self.export_object_mesh(context, out_file, i, objs, progress)
+			if i==0 or l.data.name!=prev_mesh:
+				mesh = self.export_object_mesh(context, out_file, l, objs, progress)
 				prev_mesh = l.data.name
 
 			same_tech = True
@@ -88,15 +88,21 @@ class ObjectExporter:
 			if i>0:
 				out_file.end()
 
-	def export_object_mesh(self, context, out_file, lod_index, objs, progress):
+	def export_object_mesh(self, context, out_file, lod, objs, 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 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"
 			mesh_out = open_output(os.path.join(path, name))
 			mesh = mesh_export.export(context, mesh_out, objs, progress)
 			out_file.write("mesh", '"{}"'.format(name))
@@ -135,7 +141,7 @@ class ObjectExporter:
 					mat_name = material.name+".mat"
 					mat_out = open_output(os.path.join(path, mat_name))
 					self.export_material(material, mat_out)
-					out_file.write("material", '""', '"{}"'.format(mat_name))
+					out_file.write("material", '"surface"', '"{}"'.format(mat_name))
 				out_file.end()
 				out_file.end()
 			else: