chiark
/
gitweb
/
~ianmdlvl
/
cura.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6edfa61
)
Fix AMF save with merged dual-extrusion objects.
author
daid
<daid303@gmail.com>
Thu, 27 Jun 2013 07:14:27 +0000
(09:14 +0200)
committer
daid
<daid303@gmail.com>
Thu, 27 Jun 2013 07:14:27 +0000
(09:14 +0200)
Cura/util/objectScene.py
patch
|
blob
|
history
diff --git
a/Cura/util/objectScene.py
b/Cura/util/objectScene.py
index 4e72f7d99871c058b7f999d6815395e44c21c9fb..389d23d00bc2edc932e1877510f947fe688d1641 100644
(file)
--- 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()