Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes

Conflicts:
	js/helper-classes/3D/StageLine.js

1 files changed, 15 insertions, 15 deletions

diff --git a/assets/shaders/linearGradient.vert.glsl b/assets/shaders/linearGradient.vert.glsl
index 165c2646..12b36c0f 100755
--- a/assets/shaders/linearGradient.vert.glsl
+++ b/assets/shaders/linearGradient.vert.glsl
@@ -51,25 +51,25 @@ uniform mat4 u_normalMatrix;
 uniform mat4 u_projMatrix;
 uniform mat4 u_worldMatrix;
 
-uniform vec4    u_color1;                                                                       
-uniform vec4    u_color2;                                                                       
-uniform vec4    u_color3;                                                                       
-uniform vec4    u_color4;                                                                       
-uniform float   u_colorStop1;                                                                   
-uniform float   u_colorStop2;                                                                   
-uniform float   u_colorStop3;                                                                   
-uniform float   u_colorStop4;                                                                   
-uniform vec2    u_cos_sin_angle;
-//uniform int           u_colorCount;   // currently using 4
+uniform vec4    u_color1;
+uniform vec4    u_color2;
+uniform vec4    u_color3;
+uniform vec4    u_color4;
+uniform float   u_colorStop1;
+uniform float   u_colorStop2;
+uniform float   u_colorStop3;
+uniform float   u_colorStop4;
+uniform vec2    u_cos_sin_angle;
+//uniform int       u_colorCount;   // currently using 4
 uniform mat3 u_texTransform;
 
-varying         vec2 v_uv;
+varying     vec2 v_uv;
 
 
 void main(void)
 {
-        gl_Position = u_projMatrix * u_mvMatrix * vec4(vert,1.0) ;
-        //v_uv = texcoord;
-        vec3 tmp = u_texTransform * vec3( texcoord, 1.0);
-        v_uv = tmp.xy;
+    gl_Position = u_projMatrix * u_mvMatrix * vec4(vert,1.0) ;
+    //v_uv = texcoord;
+    vec3 tmp = u_texTransform * vec3( texcoord, 1.0);
+    v_uv = tmp.xy;
 }