From: daid <daid303@gmail.com>
Date: Thu, 27 Jun 2013 07:14:27 +0000 (+0200)
Subject: Fix AMF save with merged dual-extrusion objects.
X-Git-Tag: 13.10~134
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c0d77a5a9e5cfaa69ee911a9525176c5d096f9c7;p=cura.git

Fix AMF save with merged dual-extrusion objects.
---

diff --git a/Cura/util/objectScene.py b/Cura/util/objectScene.py
index 4e72f7d9..389d23d0 100644
--- a/Cura/util/objectScene.py
+++ b/Cura/util/objectScene.py
@@ -136,6 +136,8 @@ class Scene(object):
 	def merge(self, obj1, obj2):
 		self.remove(obj2)
 		obj1._meshList += obj2._meshList
+		for m in obj2._meshList:
+			m._obj = obj1
 		obj1.processMatrix()
 		obj1.setPosition((obj1.getPosition() + obj2.getPosition()) / 2)
 		self.pushFree()