Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1

This commit is contained in:
Ghostkeeper 2016-02-23 09:31:15 +01:00
commit 0989f8ced7
3 changed files with 6 additions and 2 deletions

View file

@ -106,7 +106,8 @@ class ProcessSlicedObjectListJob(Job):
points -= center
layer_data.addPolygon(layer.id, polygon.type, points, polygon.line_width)
Job.yieldThread()
Job.yieldThread()
current_layer += 1
progress = (current_layer / layer_count) * 100
# TODO: Rebuild the layer data mesh once the layer has been processed.

View file

@ -33,6 +33,7 @@ class SolidView(View):
if not self._disabled_shader:
self._disabled_shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "overhang.shader"))
self._disabled_shader.setUniformValue("u_diffuseColor", [0.68, 0.68, 0.68, 1.0])
self._disabled_shader.setUniformValue("u_overhangAngle", math.cos(math.radians(0)))
if Application.getInstance().getMachineManager().getWorkingProfile():
profile = Application.getInstance().getMachineManager().getWorkingProfile()

View file

@ -1296,8 +1296,10 @@
"unit": "°",
"type": "float",
"min_value": "-90",
"min_value_warning": "-45",
"max_value_warning": "45",
"max_value": "90",
"default": -30,
"default": 30,
"visible": false,
"enabled": "support_conical_enabled and support_enable"
},