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

diff --git a/assets/shaders/Cloud.vert.glsl b/assets/shaders/Cloud.vert.glsl
index 95c14132..a33429fe 100644
--- a/assets/shaders/Cloud.vert.glsl
+++ b/assets/shaders/Cloud.vert.glsl
@@ -34,7 +34,7 @@ precision highp float;
 #endif
 
 // attributes
-attribute vec3  a_pos;
+attribute vec3  a_pos;
 attribute vec2  texcoord;
 
 // uniforms
@@ -48,7 +48,7 @@ uniform mat4 u_mvMatrix;
 uniform mat4 u_projMatrix;
 
 // varying
-varying vec2    v_texCoord0;
+varying vec2    v_texCoord0;
 
 // constants
 const float zSpeed = 10.0;
@@ -57,19 +57,19 @@ const float zSpeed = 10.0;
 void main()
 {
     // Transform position
-        vec4 pos = vec4(a_pos,1);
+    vec4 pos = vec4(a_pos,1);
 
-        float dz = u_time*zSpeed;
-        float n = floor( dz/(u_zmax-u_zmin) );
-        dz -= n*(u_zmax - u_zmin);
-        float z = pos.z + dz;
-        if (z > u_zmax)
-        {
-                z = u_zmin + (z - u_zmax);
-        }
-        pos.z = z;
+    float dz = u_time*zSpeed;
+    float n = floor( dz/(u_zmax-u_zmin) );
+    dz -= n*(u_zmax - u_zmin);
+    float z = pos.z + dz;
+    if (z > u_zmax)
+    {
+        z = u_zmin + (z - u_zmax);
+    }
+    pos.z = z;
+
+    gl_Position = u_projMatrix * u_mvMatrix * pos;
 
-        gl_Position = u_projMatrix * u_mvMatrix * pos;
-            
     v_texCoord0 = texcoord;
 }