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

diff --git a/js/lib/rdge/materials/radial-blur-material.js b/js/lib/rdge/materials/radial-blur-material.js
index d71a0459..c1a6fe2e 100644
--- a/js/lib/rdge/materials/radial-blur-material.js
+++ b/js/lib/rdge/materials/radial-blur-material.js
@@ -49,17 +49,17 @@ var RadialBlurMaterial = function RadialBlurMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Property Accessors
     ///////////////////////////////////////////////////////////////////////
-    this.getName                = function ()   { return this._name;                            };
-    this.getShaderName  = function ()   { return this._shaderName;                      };
-        this.getShaderDef       = function()    {  return radialBlurMaterialDef;        };
-    this.isAnimated             = function ()   { return true;                                          };
+    this.getName        = function ()   { return this._name;                };
+    this.getShaderName  = function ()   { return this._shaderName;          };
+    this.getShaderDef   = function()    {  return radialBlurMaterialDef;    };
+    this.isAnimated     = function ()   { return true;                      };
 
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
-    this._propNames  = ["u_tex0",               "u_speed"];
-    this._propLabels = ["Texture map",  "Speed" ];
-    this._propTypes  = ["file",                 "float" ];
+    this._propNames  = ["u_tex0",       "u_speed"];
+    this._propLabels = ["Texture map",  "Speed" ];
+    this._propTypes  = ["file",         "float" ];
     this._propValues = [];
 
     this._propValues[this._propNames[0]] = this._defaultTexMap.slice(0);
@@ -136,42 +136,42 @@ var RadialBlurMaterial = function RadialBlurMaterial() {
 // shader spec (can also be loaded from a .JSON file, or constructed at runtime)
 var radialBlurMaterialDef =
 { 'shaders':
-        {
-            'defaultVShader': "assets/shaders/Basic.vert.glsl",
-            'defaultFShader': "assets/shaders/radialBlur.frag.glsl"
-        },
+    {
+        'defaultVShader': "assets/shaders/Basic.vert.glsl",
+        'defaultFShader': "assets/shaders/radialBlur.frag.glsl"
+    },
     'techniques':
-        {
-            'default':
-                [
-                        {
-                            'vshader': 'defaultVShader',
-                            'fshader': 'defaultFShader',
-                            // attributes
-                            'attributes':
-                                {
-                                    'vert': { 'type': 'vec3' },
-                                    'normal': { 'type': 'vec3' },
-                                    'texcoord': { 'type': 'vec2' }
-                                },
-                            // parameters
-                            'params':
-                                {
-                                    'u_tex0': { 'type': 'tex2d' },
-                                    'u_time': { 'type': 'float' },
-                                    'u_speed': { 'type': 'float' },
-                                    'u_resolution': { 'type': 'vec2' },
-                                },
-
-                            // render states
-                            'states':
-                                {
-                                    'depthEnable': true,
-                                    'offset': [1.0, 0.1]
-                                }
-                        }
-                ]
-        }
+    {
+        'default':
+        [
+            {
+                'vshader': 'defaultVShader',
+                'fshader': 'defaultFShader',
+                // attributes
+                'attributes':
+                {
+                    'vert': { 'type': 'vec3' },
+                    'normal': { 'type': 'vec3' },
+                    'texcoord': { 'type': 'vec2' }
+                },
+                // parameters
+                'params':
+                {
+                    'u_tex0': { 'type': 'tex2d' },
+                    'u_time': { 'type': 'float' },
+                    'u_speed': { 'type': 'float' },
+                    'u_resolution': { 'type': 'vec2' },
+                },
+
+                // render states
+                'states':
+                {
+                    'depthEnable': true,
+                    'offset': [1.0, 0.1]
+                }
+            }
+        ]
+    }
 };