From: daid <daid303@gmail.com>
Date: Wed, 7 Jan 2015 13:58:08 +0000 (+0100)
Subject: Merge branch 'SteamEngine' of github.com:daid/Cura into SteamEngine
X-Git-Tag: 15.01-RC8~15
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=66075b0f2e039b240c0aa3a2027f6d061f501e32;p=cura.git

Merge branch 'SteamEngine' of github.com:daid/Cura into SteamEngine

Conflicts:
	Cura/gui/util/engineResultView.py
---

66075b0f2e039b240c0aa3a2027f6d061f501e32
diff --cc Cura/gui/util/engineResultView.py
index 939b152a,f5a3f12a..5431ceef
--- a/Cura/gui/util/engineResultView.py
+++ b/Cura/gui/util/engineResultView.py
@@@ -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: