Merge branch '2.7'

This commit is contained in:
Ghostkeeper 2017-08-11 12:38:49 +02:00
commit 4728f31996
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
3 changed files with 6 additions and 3 deletions

View file

@ -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):

View file

@ -6,7 +6,7 @@
{
"type": "extruder",
"author": "Ultimaker",
"manufacturer": "Ultimaker B.V.",
"manufacturer": "Unknown",
"setting_version": 1,
"visible": false
},

View file

@ -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,