chiark / gitweb /
Merge branch 'SteamEngine' of github.com:daid/Cura into SteamEngine
authordaid <daid303@gmail.com>
Wed, 7 Jan 2015 13:58:08 +0000 (14:58 +0100)
committerdaid <daid303@gmail.com>
Wed, 7 Jan 2015 13:58:08 +0000 (14:58 +0100)
Conflicts:
Cura/gui/util/engineResultView.py

1  2 
Cura/gui/util/engineResultView.py

index 939b152ad3b0631e8048805a72667b17e278495f,f5a3f12a4ebfdc8dfadf833495ebd3bb7dbe730f..5431ceef0020ffdfc0c140b488d60c27ae24d6b4
@@@ -24,7 -25,8 +25,8 @@@ class engineResultView(object)
                self._layerVBOs = []
                self._layer20VBOs = []
  
 -              self.layerSelect = openglGui.glSlider(self._parent, 10000, 0, 1, (-1,-2), lambda : self._parent.QueueRefresh())
 +              self.layerSelect = openglGui.glSlider(self._parent, 10000, 1, 1, (-1,-2), lambda : self._parent.QueueRefresh())
+               self.singleLayerToggle = openglGui.glButton(self._parent, 23, _("Single Layer"), (-1,-1.5), self.OnSingleLayerToggle, 0.5) #stay half size of the base size
  
        def setResult(self, result):
                if self._result == result: