Shader fix for MacOS.

diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py
index 124053b74945865fdb708acc249ffa8d284b744c..4fa7d41878f8a610d236d4acc8212aaed9ae6a94 100644 (file)
--- 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 a9c0d71a9be9264685ca46cff764d62ed4db5317..c0b10453428b04a6cf12186b7df3584ec0692984 100644 (file)
--- 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',