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

diff --git a/blender/io_mspgl/export_scene.py b/blender/io_mspgl/export_scene.py
index 16435e8f..b2c3a2e6 100644
--- a/blender/io_mspgl/export_scene.py
+++ b/blender/io_mspgl/export_scene.py
@@ -30,21 +30,21 @@ class SceneExporter:
 		object_prototypes = {}
 		unique_objects = []
 		export_names = {}
+		used_names = set()
 		for o in objs:
 			if o.name in object_prototypes:
 				continue
 
 			clones = [o]
-			if not any(s.link=="OBJECT" for s in o.material_slots):
-				for u in objs:
-					if u is o:
-						continue
-					if u.data.name!=o.data.name:
-						continue
-					if any(s.link=="OBJECT" for s in u.material_slots):
-						continue
+			for u in objs:
+				if u is o:
+					continue
+				if u.data.name!=o.data.name:
+					continue
+				if any(m1.name!=m2.name for m1, m2 in zip(o.material_slots, u.material_slots)):
+					continue
 
-					clones.append(u)
+				clones.append(u)
 
 			prefix = o.name
 			for c in clones:
@@ -55,12 +55,23 @@ class SceneExporter:
 					prefix = prefix[:pos]
 
 			if prefix:
-				export_names[o.name+".object"] = prefix.strip(" .")+".object"
+				export_names[o.name+".object"] = prefix.strip(" .")
+			else:
+				used_names.add(o.name)
 
 			unique_objects.append(o)
 			for c in clones:
 				object_prototypes[c.name] = o
 
+		for n, e in export_names.items():
+			if e in used_names:
+				number = 1
+				while "{}_{}".format(e, number) in used_names:
+					number += 1
+				e += "_{}".format(number)
+			export_names[n] = e+".object"
+			used_names.add(e)
+
 		from .util import Progress
 		progress = Progress(self.show_progress and context)
 
@@ -70,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:
@@ -92,19 +103,21 @@ class SceneExporter:
 		object_export = ObjectExporter()
 		object_export.single_file = False
 
-		material_atlass = {}
+		material_atlases = {}
 
 		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_atlass=material_atlass)
+			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):
-		from .datafile import Resource, Statement
+	def export_scene(self, context, objs, resources, prototypes, progress):
+		from .datafile import Resource, Statement, Token
 		scene_res = Resource("scene.scene", "scene")
 
+		scene_res.statements.append(Statement("type", Token(context.scene.scene_type.lower())))
+
 		for o in objs:
 			obj_res = resources[prototypes[o.name].name+".object"]
 			st = scene_res.create_reference_statement("object", obj_res, o.name)