Merge pull request #1451 from blackberry/master

Merge master to next

gameplay/res/shaders/terrain.frag

@@ -133,7 +133,7 @@ void main()
 
     #else
 
-    gl_FragColor.rgb = _baseColor;
+    gl_FragColor.rgb = _baseColor.rgb;
 
     #endif
 }