X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=blender%2Fio_mspgl%2Fexport_scene.py;h=c66feed7aadf9c1218c379a51b94d92fb74e119e;hb=94d95c02822b2cff8e5d8254fed7b3058584acf7;hp=9b36c48ff43faadb0f7ef6da596f37e7806dfd47;hpb=d5c26741ed3952dd54c8a7f43ad42ba79bf2d977;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_scene.py b/blender/io_mspgl/export_scene.py
index 9b36c48f..c66feed7 100644
--- a/blender/io_mspgl/export_scene.py
+++ b/blender/io_mspgl/export_scene.py
@@ -39,10 +39,11 @@ class SceneExporter:
 
 			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
+				while not c.name.startswith(prefix):
+					pos = max(prefix.rfind(' '), prefix.rfind('.'))
+					if pos<0:
+						break;
+					prefix = prefix[:pos]
 
 			if prefix:
 				export_names[o.name+".object"] = prefix.strip(" .")+".object"
@@ -110,7 +111,8 @@ class SceneExporter:
 			obj_res = resources[prototypes[o.name].name+".object"]
 			st = scene_res.create_reference_statement("object", obj_res, o.name)
 			# XXX Parent relationships screw up the location and rotation
-			st.sub.append(Statement("position", o.location[0], o.location[1], o.location[2]))
+			ss = Statement("transform")
+			ss.sub.append(Statement("position", o.location[0], o.location[1], o.location[2]))
 			if o.rotation_mode=="AXIS_ANGLE":
 				angle = o.rotation_axis_angle[0]
 				axis = o.rotation_axis_angle[1:]
@@ -121,8 +123,9 @@ class SceneExporter:
 					q = o.rotation_euler.to_quaternion()
 				angle = q.angle
 				axis = q.axis
-			st.sub.append(Statement("rotation", angle*180/math.pi, axis[0], axis[1], axis[2]))
-			st.sub.append(Statement("scale", o.scale[0], o.scale[1], o.scale[2]))
+			ss.sub.append(Statement("rotation", angle*180/math.pi, axis[0], axis[1], axis[2]))
+			ss.sub.append(Statement("scale", o.scale[0], o.scale[1], o.scale[2]))
+			st.sub.append(ss)
 			scene_res.statements.append(st)
 
 		progress.set_progress(1.0)