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

diff --git a/js/lib/rdge/materials/taper-material.js b/js/lib/rdge/materials/taper-material.js
index b4ff07d3..bf5236fd 100644
--- a/js/lib/rdge/materials/taper-material.js
+++ b/js/lib/rdge/materials/taper-material.js
@@ -38,7 +38,7 @@ var Texture = require("js/lib/rdge/texture").Texture;
 var TaperMaterial = function TaperMaterial()
 {
     // initialize the inherited members
-        this.inheritedFrom = Material;
+    this.inheritedFrom = Material;
     this.inheritedFrom();
 
     ///////////////////////////////////////////////////////////////////////
@@ -55,8 +55,8 @@ var TaperMaterial = function TaperMaterial()
     this.getShaderName = function () { return this._shaderName; };
 
     this.isAnimated = function () { return true; };
-        this.getShaderDef       = function()    {  return taperShaderDef;       };
-        this.getTechniqueName   = function() {  return 'colorMe'  };
+    this.getShaderDef   = function()    {  return taperShaderDef;   };
+    this.getTechniqueName   = function() {  return 'colorMe'  };
 
     this.hasVertexDeformation = function () { return this._hasVertexDeformation; };
     this._hasVertexDeformation = true;
@@ -78,7 +78,7 @@ var TaperMaterial = function TaperMaterial()
         // set up the material node
         this._materialNode = RDGE.createMaterialNode("taperMaterial" + "_" + world.generateUniqueNodeID());
         this._materialNode.setShader(this._shader);
- 
+
         this._time = 0;
         if (this._shader && this._shader['default']) {
             this._shader['default'].u_time.set([this._time]);
@@ -99,7 +99,7 @@ var TaperMaterial = function TaperMaterial()
                 this._propValues[this._propNames[6]] = 0.9;
                 this._propValues[this._propNames[7]] = this._vertexDeformationTolerance;
                 this._propValues[this._propNames[8]] = 1.0;
-        
+
                 var nProps = this._propNames.length;
                 for (var i=0; i<nProps;  i++)
                         this.setProperty( this._propNames[i],  this._propValues[this._propNames[i]]  );
@@ -137,7 +137,7 @@ var TaperMaterial = function TaperMaterial()
             }
 
             var t1 = this._propValues["u_limit1"] - this._deltaTime,
-                                t2 = this._propValues["u_limit2"] - this._deltaTime;
+                t2 = this._propValues["u_limit2"] - this._deltaTime;
 
 
             this._shader.colorMe["u_limit1"].set([t1]);
@@ -158,32 +158,32 @@ taperShaderDef = {
     },
     'techniques': { // rendering control
         'colorMe': [ // simple color pass
-                        {
-                        'vshader': 'defaultVShader',
-                        'fshader': 'defaultFShader',
-
-                        // attributes
-                        'attributes':
-                                 {
-                                     'vert': { 'type': 'vec3' },
-                                     'normal': { 'type': 'vec3' },
-                                     'texcoord': { 'type': 'vec2' }
-                                 },
-                        // attributes
-                        'params':
-                                 {
-                                     'u_limit1': { 'type': 'float' },
-                                     'u_limit2': { 'type': 'float' },
-                                     'u_limit3': { 'type': 'float' },
-                                     'u_minVal': { 'type': 'float' },
-                                     'u_maxVal': { 'type': 'float' },
-                                     'u_center': { 'type': 'float' },
-                                     'u_taperAmount': { 'type': 'float' },
+            {
+            'vshader': 'defaultVShader',
+            'fshader': 'defaultFShader',
+
+            // attributes
+            'attributes':
+                 {
+                     'vert': { 'type': 'vec3' },
+                     'normal': { 'type': 'vec3' },
+                     'texcoord': { 'type': 'vec2' }
+                 },
+            // attributes
+            'params':
+                 {
+                     'u_limit1': { 'type': 'float' },
+                     'u_limit2': { 'type': 'float' },
+                     'u_limit3': { 'type': 'float' },
+                     'u_minVal': { 'type': 'float' },
+                     'u_maxVal': { 'type': 'float' },
+                     'u_center': { 'type': 'float' },
+                     'u_taperAmount': { 'type': 'float' },
                                          'facettol': { 'type': 'float' },
-                                     'u_speed': { 'type': 'float' }
-                                 }
+                     'u_speed': { 'type': 'float' }
+                 }
             }
-                ]
+        ]
     }
 };