Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal

Conflicts:
	js/components/gradientpicker.reel/gradientpicker.js
	js/components/tools-properties/text-properties.reel/text-properties.js
	js/document/views/base.js
	js/document/views/design.js
	js/helper-classes/3D/StageLine.js
	js/helper-classes/3D/draw-utils.js
	js/lib/drawing/world.js
	js/lib/geom/circle.js
	js/lib/geom/line.js
	js/lib/geom/rectangle.js
	js/lib/geom/shape-primitive.js
	js/lib/rdge/materials/bump-metal-material.js
	js/lib/rdge/materials/flag-material.js
	js/lib/rdge/materials/fly-material.js
	js/lib/rdge/materials/julia-material.js
	js/lib/rdge/materials/keleidoscope-material.js
	js/lib/rdge/materials/mandel-material.js
	js/lib/rdge/materials/material.js
	js/lib/rdge/materials/plasma-material.js
	js/lib/rdge/materials/pulse-material.js
	js/lib/rdge/materials/radial-gradient-material.js
	js/lib/rdge/materials/taper-material.js
	js/lib/rdge/materials/twist-vert-material.js
	js/lib/rdge/materials/water-material.js
	js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
	js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
	js/panels/Materials/materials-popup.reel/materials-popup.html
	js/panels/Materials/materials-popup.reel/materials-popup.js
	js/tools/LineTool.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 35 insertions, 35 deletions

diff --git a/assets/shaders/radialGradient.frag.glsl b/assets/shaders/radialGradient.frag.glsl
index 1544e457..58b43a74 100644
--- a/assets/shaders/radialGradient.frag.glsl
+++ b/assets/shaders/radialGradient.frag.glsl
@@ -32,44 +32,44 @@ POSSIBILITY OF SUCH DAMAGE.
 precision highp float;
 #endif
 
-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 all 4
-        
-varying vec2    v_uv;
+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 all 4
+
+varying vec2    v_uv;
 
 void main(void)
 {
-        vec2 pt = vec2( v_uv.x - 0.5,  v_uv.y - 0.5);
-        float t = sqrt( dot(pt, pt) );
+    vec2 pt = vec2( v_uv.x - 0.5,  v_uv.y - 0.5);
+    float t = sqrt( dot(pt, pt) );
 
-        vec4 color;
-        if (t < u_colorStop1)
-                color = u_color1;
-        else if (t < u_colorStop2)
-        {
-                float tLocal = (t - u_colorStop1)/(u_colorStop2 - u_colorStop1);
-                color = mix(u_color1,u_color2,tLocal);
-        }
-        else if (t < u_colorStop3)
-        {
-                float tLocal = (t - u_colorStop2)/(u_colorStop3 - u_colorStop2);
-                color = mix(u_color2,u_color3,tLocal);
-        }
-        else if (t < u_colorStop4)
-        {
-                float tLocal = (t - u_colorStop3)/(u_colorStop4 - u_colorStop3);
-                color = mix(u_color3,u_color4,tLocal);
-        }
-        else
-                color = u_color4;
+    vec4 color;
+    if (t < u_colorStop1)
+        color = u_color1;
+    else if (t < u_colorStop2)
+    {
+        float tLocal = (t - u_colorStop1)/(u_colorStop2 - u_colorStop1);
+        color = mix(u_color1,u_color2,tLocal);
+    }
+    else if (t < u_colorStop3)
+    {
+        float tLocal = (t - u_colorStop2)/(u_colorStop3 - u_colorStop2);
+        color = mix(u_color2,u_color3,tLocal);
+    }
+    else if (t < u_colorStop4)
+    {
+        float tLocal = (t - u_colorStop3)/(u_colorStop4 - u_colorStop3);
+        color = mix(u_color3,u_color4,tLocal);
+    }
+    else
+        color = u_color4;
 
-        gl_FragColor = color;
+    gl_FragColor = color;
 }