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:
c8f65c6
)
Center the objects after merging and then push everything else out of the way.
author
daid303
<daid303@gmail.com>
Tue, 9 Apr 2013 07:10:42 +0000
(09:10 +0200)
committer
daid303
<daid303@gmail.com>
Tue, 9 Apr 2013 07:10:42 +0000
(09:10 +0200)
Cura/util/objectScene.py
patch
|
blob
|
history
diff --git
a/Cura/util/objectScene.py
b/Cura/util/objectScene.py
index 0ad1dda60d69712ec29757c7bd2ffbc0da3b403f..925d637b779c52840177dbfa472fba25981add48 100644
(file)
--- 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