mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-05 04:54:04 -06:00
Merge branch '15.10'
This commit is contained in:
commit
5fecc76d3f
63 changed files with 79690 additions and 39815 deletions
|
@ -68,7 +68,7 @@ class CuraApplication(QtApplication):
|
|||
if not hasattr(sys, "frozen"):
|
||||
Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)), ".."))
|
||||
|
||||
super().__init__(name = "cura", version = "15.09.81")
|
||||
super().__init__(name = "cura", version = "15.09.82")
|
||||
|
||||
self.setWindowIcon(QIcon(Resources.getPath(Resources.Images, "cura-icon.png")))
|
||||
|
||||
|
@ -283,19 +283,13 @@ class CuraApplication(QtApplication):
|
|||
new_node.callDecoration("setConvexHull",None)
|
||||
|
||||
op.addOperation(AddSceneNodeOperation(new_node,node.getParent().getParent()))
|
||||
|
||||
pass
|
||||
else:
|
||||
new_node = SceneNode()
|
||||
new_node.setMeshData(node.getMeshData())
|
||||
|
||||
new_node.translate(Vector((i + 1) * node.getBoundingBox().width, node.getPosition().y, 0))
|
||||
new_node.setOrientation(node.getOrientation())
|
||||
new_node.setScale(node.getScale())
|
||||
new_node.setSelectable(True)
|
||||
new_node = copy.deepcopy(node)
|
||||
new_node.callDecoration("setConvexHull", None)
|
||||
op.addOperation(AddSceneNodeOperation(new_node, node.getParent()))
|
||||
|
||||
op.push()
|
||||
|
||||
|
||||
## Center object on platform.
|
||||
@pyqtSlot("quint64")
|
||||
def centerObject(self, object_id):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue