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

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

1 files changed, 4 insertions, 4 deletions

diff --git a/assets/shaders/radialGradient.vert.glsl b/assets/shaders/radialGradient.vert.glsl
index eea365c6..06f26ae0 100644
--- a/assets/shaders/radialGradient.vert.glsl
+++ b/assets/shaders/radialGradient.vert.glsl
@@ -44,11 +44,11 @@ uniform mat4 u_mvMatrix;
 uniform mat4 u_projMatrix;
 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) ;
-        vec3 tmp = u_texTransform * vec3( texcoord, 1.0);
-        v_uv = tmp.xy;
+    gl_Position = u_projMatrix * u_mvMatrix * vec4(vert,1.0) ;
+    vec3 tmp = u_texTransform * vec3( texcoord, 1.0);
+    v_uv = tmp.xy;
 }