Seperate the machine settings from the preference settings

[cura.git] / Cura / util / gcodeInterpreter.py

diff --git a/Cura/util/gcodeInterpreter.py b/Cura/util/gcodeInterpreter.py
index 03d2dd415b6a1bf45a0e88fa5778138a1064afa4..9551ee1218e4bc067f644873bb06ec12996f29ba 100644 (file)
--- a/Cura/util/gcodeInterpreter.py
+++ b/Cura/util/gcodeInterpreter.py
@@ -117,12 +117,12 @@ class gcode(object):
                        T = getCodeInt(line, 'T')
                        if T is not None:
                                if currentExtruder > 0:
-                                       posOffset[0] -= profile.getPreferenceFloat('extruder_offset_x%d' % (currentExtruder))
-                                       posOffset[1] -= profile.getPreferenceFloat('extruder_offset_y%d' % (currentExtruder))
+                                       posOffset[0] -= profile.getMachineSettingFloat('extruder_offset_x%d' % (currentExtruder))
+                                       posOffset[1] -= profile.getMachineSettingFloat('extruder_offset_y%d' % (currentExtruder))
                                currentExtruder = T
                                if currentExtruder > 0:
-                                       posOffset[0] += profile.getPreferenceFloat('extruder_offset_x%d' % (currentExtruder))
-                                       posOffset[1] += profile.getPreferenceFloat('extruder_offset_y%d' % (currentExtruder))
+                                       posOffset[0] += profile.getMachineSettingFloat('extruder_offset_x%d' % (currentExtruder))
+                                       posOffset[1] += profile.getMachineSettingFloat('extruder_offset_y%d' % (currentExtruder))
                        
                        G = getCodeInt(line, 'G')
                        if G is not None: