Merge remote-tracking branch 'origin/4.1'

This commit is contained in:
Lipu Fei 2019-05-24 10:50:43 +02:00
commit 7c6c00df84
2 changed files with 2 additions and 2 deletions

View File

@ -117,8 +117,6 @@ class SettingOverrideDecorator(SceneNodeDecorator):
# Trigger slice/need slicing if the value has changed. # Trigger slice/need slicing if the value has changed.
self._is_non_printing_mesh = self._evaluateIsNonPrintingMesh() self._is_non_printing_mesh = self._evaluateIsNonPrintingMesh()
self._is_non_thumbnail_visible_mesh = self._evaluateIsNonThumbnailVisibleMesh() self._is_non_thumbnail_visible_mesh = self._evaluateIsNonThumbnailVisibleMesh()
# Only calculate the bounding box of the mesh if it's an actual mesh (and not a helper)
self._node.setCalculateBoundingBox(not self._is_non_printing_mesh)
Application.getInstance().getBackend().needsSlicing() Application.getInstance().getBackend().needsSlicing()
Application.getInstance().getBackend().tickle() Application.getInstance().getBackend().tickle()

View File

@ -98,8 +98,10 @@ class SupportEraser(Tool):
node.setName("Eraser") node.setName("Eraser")
node.setSelectable(True) node.setSelectable(True)
node.setCalculateBoundingBox(True)
mesh = self._createCube(10) mesh = self._createCube(10)
node.setMeshData(mesh.build()) node.setMeshData(mesh.build())
node.calculateBoundingBoxMesh()
active_build_plate = CuraApplication.getInstance().getMultiBuildPlateModel().activeBuildPlate active_build_plate = CuraApplication.getInstance().getMultiBuildPlateModel().activeBuildPlate
node.addDecorator(BuildPlateDecorator(active_build_plate)) node.addDecorator(BuildPlateDecorator(active_build_plate))