X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_scene.py;h=2ec85ccbddbdef3ed708ddae330d5b713fb98bea;hb=4bc50a3c977af89ab4a79aa777bb99322cda053d;hp=a3f0a4e44a5823eae380acac69b9b9d9bc78f4d4;hpb=42ae18b7a9dc13a72bf421e564f02829d4bdd5be;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_scene.py b/blender/io_mspgl/export_scene.py
index a3f0a4e4..2ec85ccb 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)
 
@@ -77,7 +88,7 @@ class SceneExporter:
 			filter = None
 			if self.skip_existing:
 				filter = lambda r: not os.path.exists(os.path.join(path, r.name))
-			scene_res.write_collection(os.path.join(path, base+"_resources.mdc"), exclude=self=True, filter)
+			scene_res.write_collection(os.path.join(path, base+"_resources.mdc"), exclude_self=True, filter=filter)
 		else:
 			res_dir = os.path.join(path, base+"_resources")
 			if not os.path.exists(res_dir):
@@ -92,11 +103,11 @@ class SceneExporter:
 		object_export = ObjectExporter()
 		object_export.single_file = False
 
-		material_maps = {}
+		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_maps=material_maps)
+			object_export.export_object_resources(context, o, resources, progress, material_atlases=material_atlases)
 			obj_name = o.name+".object"
 			resources[obj_name] = object_export.export_object(context, o, progress, resources=resources)
 			progress.pop_task()