Fix color selection.

diff --git a/Cura/gui/configBase.py b/Cura/gui/configBase.py
index 7bc4ebfccc1cab52e0a4bce37a603e799bdee030..f3f3842126ad7faf896c1bae7d884b6dc98966d6 100644 (file)
--- a/Cura/gui/configBase.py
+++ b/Cura/gui/configBase.py
@@ -170,7 +170,7 @@ class SettingRow():
                        self.ctrl = wx.CheckBox(panel, -1, style=wx.ALIGN_RIGHT)
                        self.SetValue(self.setting.getValue())
                        self.ctrl.Bind(wx.EVT_CHECKBOX, self.OnSettingChange)
-               elif self.setting.getType() is wx.Colour:
+               elif valueOverride is not None and valueOverride is wx.Colour:
                        self.ctrl = wx.ColourPickerCtrl(panel, -1)
                        self.SetValue(self.setting.getValue())
                        self.ctrl.Bind(wx.EVT_COLOURPICKER_CHANGED, self.OnSettingChange)

diff --git a/Cura/gui/preferencesDialog.py b/Cura/gui/preferencesDialog.py
index 10cac7283bc292bebf0204e3bd3ffe67cf927f35..66aaf042a51fc622d3849ed6bde9c1358a097f9a 100644 (file)
--- a/Cura/gui/preferencesDialog.py
+++ b/Cura/gui/preferencesDialog.py
@@ -33,9 +33,9 @@ class preferencesDialog(wx.Frame):
                        configBase.SettingRow(left, 'extruder_offset_y%d' % (i))
 
                configBase.TitleRow(left, 'Colours')
-               configBase.SettingRow(left, 'model_colour')
+               configBase.SettingRow(left, 'model_colour', wx.Colour)
                for i in xrange(1, self.oldExtruderAmount):
-                       configBase.SettingRow(left, 'model_colour%d' % (i+1))
+                       configBase.SettingRow(left, 'model_colour%d' % (i+1), wx.Colour)
 
                configBase.TitleRow(right, 'Filament settings')
                configBase.SettingRow(right, 'filament_physical_density')