Make the retraction enable tick box work.

diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py
index 13a0758afba97045b289f9dd1c664d9c973cbe8d..1978ed0101828d858015811b114e2028da001e3c 100644 (file)
--- a/Cura/gui/sceneView.py
+++ b/Cura/gui/sceneView.py
@@ -6,7 +6,6 @@ import numpy
 import time
 import os
 import traceback
-import shutil
 import threading
 import math
 
@@ -441,7 +440,7 @@ class SceneView(openglGui.glGuiPanel):
        def _gcodeLoadCallback(self, progress):
                if self._gcode is None:
                        return True
-               if len(self._gcode.layerList) % 5 == 0:
+               if len(self._gcode.layerList) % 15 == 0:
                        time.sleep(0.1)
                if self._gcode is None:
                        return True

diff --git a/Cura/util/sliceEngine.py b/Cura/util/sliceEngine.py
index 9fe0e234bd3f3cc9ef54bb1753f6d70b402bd98b..6afd98d68e9ecac934e758d8f122f143b2fa0552 100644 (file)
--- a/Cura/util/sliceEngine.py
+++ b/Cura/util/sliceEngine.py
@@ -214,7 +214,7 @@ class Slicer(object):
                        'supportAngle': int(-1) if profile.getProfileSetting('support') == 'None' else int(60),
                        'supportEverywhere': int(1) if profile.getProfileSetting('support') == 'Everywhere' else int(0),
                        'supportLineWidth': int(profile.getProfileSettingFloat('support_rate') * profile.calculateEdgeWidth() * 1000 / 100),
-                       'retractionAmount': int(profile.getProfileSettingFloat('retraction_amount') * 1000),
+                       'retractionAmount': int(profile.getProfileSettingFloat('retraction_amount') * 1000) if profile.getProfileSetting('retraction_enable') == 'True' else 0,
                        'retractionSpeed': int(profile.getProfileSettingFloat('retraction_speed')),
                        'objectSink': int(profile.getProfileSettingFloat('object_sink') * 1000),
                        'minimalLayerTime': int(profile.getProfileSettingFloat('cool_min_layer_time')),