X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_scene.py;h=0ba4ad76945c734c3d6be7a3ce25f911c98c054c;hb=1c189b2a4a6c91fe4baaa2bd6760f5fc4d7558d2;hp=cd2bba8e3bb8b036a9b3ad0ea05295423d8a97d6;hpb=cfd713763d3944d45abeffd6dbb008d36ee892bf;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_scene.py b/blender/io_mspgl/export_scene.py
index cd2bba8e..0ba4ad76 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)
 
@@ -102,9 +113,11 @@ class SceneExporter:
 			progress.pop_task()
 
 	def export_scene(self, context, objs, progress, *, prototypes, resources):
-		from .datafile import Resource, Statement
+		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)