From f66a2649011394eeb66b1a1b5c5678d5314175e8 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 22 Feb 2016 14:59:33 +0100 Subject: [PATCH 1/3] Added more yield thread to prevent GIL lockdown --- plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py b/plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py index 79d4a30446..1aec739f92 100644 --- a/plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py +++ b/plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py @@ -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. From a168eab14034f0293bebc51556232d426cc68e08 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 22 Feb 2016 16:51:34 +0100 Subject: [PATCH 2/3] JSON: fix: cone angle sign inverted compared to description (CURA-869) --- resources/machines/fdmprinter.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index cbd7089976..a346374b71 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -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" }, From 64977426dfad8a3c98d687ba9064be445ba8f0ae Mon Sep 17 00:00:00 2001 From: Arjen Hiemstra Date: Mon, 22 Feb 2016 17:00:39 +0100 Subject: [PATCH 3/3] Set the right angle for rendering overhang on the outside-volume shader This prevents us from rendering overhangs with an angle of 90 degrees --- plugins/SolidView/SolidView.py | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/SolidView/SolidView.py b/plugins/SolidView/SolidView.py index d9895e1d06..607455c7b3 100644 --- a/plugins/SolidView/SolidView.py +++ b/plugins/SolidView/SolidView.py @@ -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()