Merge branch '3.2'

This commit is contained in:
Ghostkeeper 2018-01-22 15:38:23 +01:00
commit 292556b4b3
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
3 changed files with 6 additions and 8 deletions

View file

@ -1078,7 +1078,7 @@ class CuraApplication(QtApplication):
continue # Node that doesnt have a mesh and is not a group.
if only_selectable and not node.isSelectable():
continue
if not node.callDecoration("isSliceable"):
if not node.callDecoration("isSliceable") and not node.callDecoration("getLayerData"):
continue # Only remove nodes that are selectable.
if node.getParent() and node.getParent().callDecoration("isGroup"):
continue # Grouped nodes don't need resetting as their parent (the group) is resetted)
@ -1094,10 +1094,6 @@ class CuraApplication(QtApplication):
# Reset the print information:
self.getController().getScene().sceneChanged.emit(node)
# self._print_information.setToZeroPrintInformation(self.getBuildPlateModel().activeBuildPlate)
# stay on the same build plate
#self.getCuraSceneController().setActiveBuildPlate(0) # Select first build plate
## Reset all translation on nodes with mesh data.
@pyqtSlot()