From: Daid <Daid303@gmail.com>
Date: Tue, 28 May 2013 11:48:18 +0000 (+0200)
Subject: Shader fix for MacOS.
X-Git-Tag: 13.06.2~31^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=36df2d8296fcb277e1078585c46d97cb7c35590a;p=cura.git

Shader fix for MacOS.
---

diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py
index 124053b7..4fa7d418 100644
--- a/Cura/gui/sceneView.py
+++ b/Cura/gui/sceneView.py
@@ -774,7 +774,7 @@ void main(void)
 	light_amount += 0.2;
 	if (normalize(rotMatrix * gl_Normal).z < -cosAngle)
 	{
-		light_amount = -10;
+		light_amount = -10.0;
 	}
 }
 			""","""
@@ -782,9 +782,9 @@ varying float light_amount;
 
 void main(void)
 {
-	if (light_amount == -10)
+	if (light_amount == -10.0)
 	{
-		gl_FragColor = vec4(1, 0, 0, gl_Color[3]);
+		gl_FragColor = vec4(1.0, 0.0, 0.0, gl_Color[3]);
 	}else{
 		gl_FragColor = vec4(gl_Color.xyz * light_amount, gl_Color[3]);
 	}
diff --git a/setup.py b/setup.py
index a9c0d71a..c0b10453 100644
--- a/setup.py
+++ b/setup.py
@@ -9,8 +9,8 @@ if sys.platform.startswith('darwin'):
     DATA_FILES = ['Cura/LICENSE', 'Cura/resources/images', 'Cura/resources/meshes', 'Cura/resources/example', 'Cura/resources/firmware']
     PLIST = {
         u'CFBundleName': u'Cura',
-        u'CFBundleShortVersionString': u'13.03',
-        u'CFBundleVersion': u'13.03',
+        u'CFBundleShortVersionString': u'13.05',
+        u'CFBundleVersion': u'13.05',
         u'CFBundleIdentifier': u'com.ultimaker.Cura',
         u'LSMinimumSystemVersion': u'10.6',
         u'LSApplicationCategoryType': u'public.app-category.graphics-design',