From f1417858c1a08aff6dad6be4099caa42e20a7288 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 9 Sep 2015 09:49:53 +0200 Subject: [PATCH] Merged objects are no longer moved on platform plate Fixes Ultimaker/Cura#354 --- cura/CuraApplication.py | 2 +- cura/PlatformPhysics.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index ea23fbf092..fd9cbf1cb6 100644 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -434,7 +434,7 @@ class CuraApplication(QtApplication): # Reset the position of each node for node in group_node.getChildren(): new_position = node.getMeshData().getCenterPosition() - new_position.setY(0) + #new_position.setY(0) node.setPosition(new_position) # Use the previously found center of the group bounding box as the new location of the group diff --git a/cura/PlatformPhysics.py b/cura/PlatformPhysics.py index 8b0b641b4e..53e803187f 100644 --- a/cura/PlatformPhysics.py +++ b/cura/PlatformPhysics.py @@ -68,8 +68,9 @@ class PlatformPhysics: # Move it downwards if bottom is above platform move_vector = Vector() - if bbox.bottom > 0: - move_vector.setY(-bbox.bottom) + if not (node.getParent() and node.getParent().callDecoration("isGroup")): #If an object is grouped, don't move it down + if bbox.bottom > 0: + move_vector.setY(-bbox.bottom) #if not Float.fuzzyCompare(bbox.bottom, 0.0): # pass#move_vector.setY(-bbox.bottom)