From 3e870d2e4071cb7de34a282909905760352439b9 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Fri, 11 Aug 2017 12:26:50 +0200 Subject: [PATCH 1/2] Always update raft thickness and extra z clearance before rebuilding the build volume CURA-4154 --- cura/BuildVolume.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index 70578d0e02..e37268e244 100755 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -489,6 +489,7 @@ class BuildVolume(SceneNode): self._updateDisallowedAreas() self._updateRaftThickness() + self._updateExtraZClearance() if self._engine_ready: self.rebuild() @@ -546,6 +547,8 @@ class BuildVolume(SceneNode): # would hit performance. def _updateDisallowedAreasAndRebuild(self): self._updateDisallowedAreas() + self._updateRaftThickness() + self._updateExtraZClearance() self.rebuild() def _updateDisallowedAreas(self): From 824849a8782e576c9b54dc5faf86e1d5587966a0 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 11 Aug 2017 12:38:18 +0200 Subject: [PATCH 2/2] Make manufacturer for base fdm- definitions unknown They are always overwritten, but if it isn't overwritten we don't know the manufacturer for the printer. Contributes to issue CURA-4159. --- resources/definitions/fdmextruder.def.json | 2 +- resources/definitions/fdmprinter.def.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/fdmextruder.def.json b/resources/definitions/fdmextruder.def.json index 59ac6c172e..8ed194fc2d 100644 --- a/resources/definitions/fdmextruder.def.json +++ b/resources/definitions/fdmextruder.def.json @@ -6,7 +6,7 @@ { "type": "extruder", "author": "Ultimaker", - "manufacturer": "Ultimaker B.V.", + "manufacturer": "Unknown", "setting_version": 1, "visible": false }, diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 954e1a49f9..d876127d28 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -5,9 +5,9 @@ "metadata": { "type": "machine", - "author": "Ultimaker B.V.", + "author": "Ultimaker", "category": "Ultimaker", - "manufacturer": "Ultimaker B.V.", + "manufacturer": "Unknown", "setting_version": 1, "file_formats": "text/x-gcode;application/x-stl-ascii;application/x-stl-binary;application/x-wavefront-obj;application/x3g", "visible": false,