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

diff --git a/js/models/properties-3d.js b/js/models/properties-3d.js
index 98cc03b3..96c749b8 100755
--- a/js/models/properties-3d.js
+++ b/js/models/properties-3d.js
@@ -43,7 +43,7 @@ exports.Properties3D = Montage.create(Component, {
     m_endAzimuth :      {value : 0, enumerable: true},
     m_endAltitude :     {value : 0, enumerable: true},
 
-        _world :            {value : null, enumerable:true}, // keep a referenceto the GLWorld (if any)
+    _world :            {value : null, enumerable:true}, // keep a referenceto the GLWorld (if any)
 
     // Keep track of 3d properties
     matrix3d : {value : null, enumerable: true},
@@ -66,8 +66,8 @@ exports.Properties3D = Montage.create(Component, {
         value : function(elt, isStage) {
 
 //          this.m_upVector = [0,1,0];
-//                      this.m_viewDir  = [0,0,1];
-//                      this.m_endUpVector = [0,1,0];
+//          this.m_viewDir  = [0,0,1];
+//          this.m_endUpVector = [0,1,0];
 
 //          this.m_targetPos = [0,0,0];
 //          this.m_objStartPos = [0,0,0];