3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-20 13:17:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch '2.7'

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

3
cura/BuildVolume.py
View file

@ -489,6 +489,7 @@ class BuildVolume(SceneNode):
self._updateDisallowedAreas() self._updateDisallowedAreas()
self._updateRaftThickness() self._updateRaftThickness()
self._updateExtraZClearance()
if self._engine_ready: if self._engine_ready:
self.rebuild() self.rebuild()
@ -546,6 +547,8 @@ class BuildVolume(SceneNode):
# would hit performance. # would hit performance.
def _updateDisallowedAreasAndRebuild(self): def _updateDisallowedAreasAndRebuild(self):
self._updateDisallowedAreas() self._updateDisallowedAreas()
self._updateRaftThickness()
self._updateExtraZClearance()
self.rebuild() self.rebuild()
def _updateDisallowedAreas(self): def _updateDisallowedAreas(self):

2
resources/definitions/fdmextruder.def.json
View file

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

4
resources/definitions/fdmprinter.def.json
View file

@ -5,9 +5,9 @@
"metadata": "metadata":
{ {
"type": "machine", "type": "machine",
"author": "Ultimaker B.V.", "author": "Ultimaker",
"category": "Ultimaker", "category": "Ultimaker",
"manufacturer": "Ultimaker B.V.", "manufacturer": "Unknown",
"setting_version": 1, "setting_version": 1,
"file_formats": "text/x-gcode;application/x-stl-ascii;application/x-stl-binary;application/x-wavefront-obj;application/x3g", "file_formats": "text/x-gcode;application/x-stl-ascii;application/x-stl-binary;application/x-wavefront-obj;application/x3g",
"visible": false, "visible": false,