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, 11 insertions, 11 deletions

diff --git a/assets/shaders/Flag.vert.glsl b/assets/shaders/Flag.vert.glsl
index 2d5c4494..6e2854ee 100644
--- a/assets/shaders/Flag.vert.glsl
+++ b/assets/shaders/Flag.vert.glsl
@@ -55,22 +55,22 @@ varying vec2 v_uv;
 
 void main()
 {
-        float time = u_time * u_speed;
-        const float pi = 3.14159;
-        float angle = time;
+    float time = u_time * u_speed;
+    const float pi = 3.14159;
+    float angle = time;
 
     v_uv.x = texcoord.x;
     v_uv.y = texcoord.y;
 
-        float x = 2.0*pi*texcoord.x/u_waveWidth;
-        float y = 2.0*pi*texcoord.y;
+    float x = 2.0*pi*texcoord.x/u_waveWidth;
+    float y = 2.0*pi*texcoord.y;
 
     vec3 v = a_pos;
-        v.z  = sin( x + angle );
-        v.z += sin( 0.2*y + angle);
-        v.z *= u_waveHeight;
-        v.z -=  2.0*u_waveHeight;
-        v.z *= x * 0.09;
-        
+    v.z  = sin( x + angle );
+    v.z += sin( 0.2*y + angle);
+    v.z *= u_waveHeight;
+    v.z -=  2.0*u_waveHeight;
+    v.z *= x * 0.09;
+
     gl_Position = u_projMatrix * u_mvMatrix * vec4(v,1.0) ;
 }