X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_scene.py;h=3b2147d14d061b64352602aac8bf19a987f2019a;hb=f1555f34a787949894025cce908f08ca3ff60633;hp=d4e6b78f021154cba46388c53cc2c28ad5f1cf1b;hpb=f77259ba680e73daee6008f53dafe92e84a0b5f5;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_scene.py b/blender/io_mspgl/export_scene.py
index d4e6b78f..3b2147d1 100644
--- a/blender/io_mspgl/export_scene.py
+++ b/blender/io_mspgl/export_scene.py
@@ -18,6 +18,7 @@ class SceneExporter:
 
 		object_prototypes = {}
 		unique_objects = []
+		export_names = {}
 		for o in objs:
 			if o.name in object_prototypes:
 				continue
@@ -36,6 +37,16 @@ class SceneExporter:
 
 					clones.append(u)
 
+			prefix = o.name
+			for c in clones:
+				for i in range(min(len(c.name), len(prefix))):
+					if c.name[i]!=prefix[i]:
+						prefix = prefix[:i]
+						break
+
+			if prefix:
+				export_names[o.name+".object"] = prefix.strip(" .")+".object"
+
 			unique_objects.append(o)
 			for c in clones:
 				object_prototypes[c.name] = o
@@ -45,6 +56,9 @@ class SceneExporter:
 
 		resources = {}
 		self.export_scene_resources(context, unique_objects, resources, progress)
+		for n, r in resources.items():
+			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)
 		refs = scene_res.collect_references()
@@ -54,7 +68,8 @@ class SceneExporter:
 			keywords = { ".mat": "material",
 				".mesh": "mesh",
 				".object": "object",
-				".tech": "technique" }
+				".tech": "technique",
+				".tex2d": "texture2d" }
 			with open(os.path.join(path, base+"_resources.mdc"), "w") as res_out:
 				for r in refs:
 					st = Statement(keywords[os.path.splitext(r.name)[1]], r.name)
@@ -78,9 +93,11 @@ class SceneExporter:
 		object_export = ObjectExporter()
 		object_export.single_file = False
 
+		material_maps = {}
+
 		for i, o in enumerate(objs):
 			progress.push_task_slice(o.name, i, len(objs))
-			object_export.export_object_resources(context, o, resources, progress)
+			object_export.export_object_resources(context, o, resources, progress, material_maps=material_maps)
 			obj_name = o.name+".object"
 			resources[obj_name] = object_export.export_object(context, o, progress, resources=resources)
 			progress.pop_task()