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

diff --git a/js/lib/math/matrix.js b/js/lib/math/matrix.js
index 067f83e2..fe32709e 100755
--- a/js/lib/math/matrix.js
+++ b/js/lib/math/matrix.js
@@ -33,56 +33,56 @@ var Matrix = function Matrix() {
 };
 
 Matrix.create = function( rowArray ) {
-        var mat = Matrix.I(4);
-        var index = 0;
-        for(var j=0;  j<4;  j++) {
-                for (var i=0;  i<4;  i++) {
-                        mat[index] = rowArray[i][j];
-                        index++;
-                }
-        }
-
-        return mat;
+    var mat = Matrix.I(4);
+    var index = 0;
+    for(var j=0;  j<4;  j++) {
+        for (var i=0;  i<4;  i++) {
+            mat[index] = rowArray[i][j];
+            index++;
+        }
+    }
+
+    return mat;
 };
 
 Matrix.I = function(dimen) {
-        var mat = [];
+    var mat = [];
 
-        for (var i = 0; i<dimen*dimen; i++)  {
+    for (var i = 0; i<dimen*dimen; i++)  {
         mat.push(0);
     }
 
-        var index = 0;
-        for (var j = 0; j<dimen; j++) {
-                mat[index] = 1.0;
-                index += dimen + 1;
-        }
-        
-        return mat;     
+    var index = 0;
+    for (var j = 0; j<dimen; j++) {
+        mat[index] = 1.0;
+        index += dimen + 1;
+    }
+
+    return mat;
 };
 
 Matrix.Translation = function (vec) {
-        var mat = Matrix.I(4);
-        glmat4.translate(mat, vec);
-        return mat;
+    var mat = Matrix.I(4);
+    glmat4.translate(mat, vec);
+    return mat;
 };
 
 Matrix.RotationX = function( angle ) {
-        var mat = Matrix.I(4);
-        glmat4.rotateX(mat, angle);
-        return mat;
+    var mat = Matrix.I(4);
+    glmat4.rotateX(mat, angle);
+    return mat;
 };
 
 Matrix.RotationY = function( angle ) {
-        var mat = Matrix.I(4);
-        glmat4.rotateY(mat, angle);
-        return mat;
+    var mat = Matrix.I(4);
+    glmat4.rotateY(mat, angle);
+    return mat;
 };
 
 Matrix.RotationZ = function( angle ) {
-        var mat = Matrix.I(4);
-        glmat4.rotateZ(mat, angle);
-        return mat;
+    var mat = Matrix.I(4);
+    glmat4.rotateZ(mat, angle);
+    return mat;
 };
 
 Matrix.Rotation = function(angle, axis) {
@@ -94,8 +94,8 @@ Matrix.Rotation = function(angle, axis) {
 Matrix.Scale = function( scaleVec ) {
     var mat = Matrix.I(4);
     mat[ 0] = scaleVec[0];
-        mat[ 5] = scaleVec[1];
-        mat[10] = scaleVec[2];
+    mat[ 5] = scaleVec[1];
+    mat[10] = scaleVec[2];
 
     return mat;
 };
@@ -106,7 +106,7 @@ Matrix.flatten = function (mat) {
         return [];
     }
 
-        for (var i=0; i<16; i++) {
+    for (var i=0; i<16; i++) {
         result.push(mat[i]);
     }