X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_scene.py;h=63ca1f38ec2717f61c403c363677f89f5ff151c2;hb=03d2f0d7f4673b5262f396fda430e766eec4549b;hp=e272823ee164d257b1464a6f840ddb8a51e2e7cb;hpb=5590886411b5779a7e6aa6a5ffeda8db6c515a55;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_scene.py b/blender/io_mspgl/export_scene.py
index e272823e..63ca1f38 100644
--- a/blender/io_mspgl/export_scene.py
+++ b/blender/io_mspgl/export_scene.py
@@ -10,53 +10,19 @@ class SceneExporter:
 		self.show_progress = True
 
 	def export_to_file(self, context, out_fn):
-		from .scene import create_scene_from_current
-		scene = create_scene_from_current(context, selected_only=self.selected_only, visible_only=self.visible_only)
-
-		path, base = os.path.split(out_fn)
-		base, ext = os.path.splitext(base)
-
-		export_names = {}
-		used_names = set()
-		for p in scene.prototypes:
-			clones = [i for i in scene.instances if i.prototype==p.name]
-
-			prefix = p.name
-			for c in clones:
-				while not c.name.startswith(prefix):
-					pos = max(prefix.rfind(' '), prefix.rfind('.'))
-					if pos<0:
-						break;
-					prefix = prefix[:pos]
-
-			if prefix:
-				export_names[p.name+".object"] = prefix.strip(" .")
-			else:
-				used_names.add(p.name)
-
-		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)
 
-		from .export import DataExporter
-		data_exporter = DataExporter()
+		from .scene import create_scene_from_current
+		scene = create_scene_from_current(context, selected_only=self.selected_only, visible_only=self.visible_only)
 
 		resources = {}
-		data_exporter.export_resources(context, scene.prototypes, resources, None, progress)
-		for n, r in resources.items():
-			if r.name in export_names:
-				r.name = export_names[r.name]
+		self.export_scene_resources(context, scene, resources, progress)
+		scene_res = self.export_scene(scene, resources)
+		progress.set_progress(1.0)
 
-		scene_res = self.export_scene(scene, resources, progress)
-		refs = scene_res.collect_references()
+		path, base = os.path.split(out_fn)
+		base, ext = os.path.splitext(base)
 
 		if self.collection:
 			existing = None
@@ -65,10 +31,16 @@ class SceneExporter:
 			scene_res.write_collection(out_fn, filter=existing)
 		else:
 			scene_res.write_to_file(out_fn)
-			for r in refs:
+			for r in scene_res.collect_references():
 				r.write_to_file(os.path.join(path, r.name))
 
-	def export_scene(self, scene, resources, progress):
+	def export_scene_resources(self, context, scene, resources, progress):
+		from .export import DataExporter
+		data_exporter = DataExporter()
+
+		data_exporter.export_resources(context, scene.prototypes, resources, None, progress)
+
+	def export_scene(self, scene, resources):
 		from .datafile import Resource, Statement, Token
 		scene_res = Resource(scene.name+".scene", "scene")
 
@@ -96,6 +68,4 @@ class SceneExporter:
 			st.sub.append(ss)
 			scene_res.statements.append(st)
 
-		progress.set_progress(1.0)
-
 		return scene_res