From: daid303 <daid303@gmail.com>
Date: Tue, 9 Apr 2013 07:10:42 +0000 (+0200)
Subject: Center the objects after merging and then push everything else out of the way.
X-Git-Tag: 13.05~117
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c9e125c9c59de2af8d2598705cb7e220fdf64480;p=cura.git

Center the objects after merging and then push everything else out of the way.
---

diff --git a/Cura/util/objectScene.py b/Cura/util/objectScene.py
index 0ad1dda6..925d637b 100644
--- a/Cura/util/objectScene.py
+++ b/Cura/util/objectScene.py
@@ -94,6 +94,8 @@ class Scene(object):
 		self.remove(obj2)
 		obj1._meshList += obj2._meshList
 		obj1.processMatrix()
+		obj1.setPosition((obj1.getPosition() + obj2.getPosition()) / 2)
+		self.pushFree()
 
 	def pushFree(self):
 		n = 1000