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

diff --git a/js/tools/RotateStage3DTool.js b/js/tools/RotateStage3DTool.js
index 2f655333..36bf285e 100755
--- a/js/tools/RotateStage3DTool.js
+++ b/js/tools/RotateStage3DTool.js
@@ -94,15 +94,15 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
             var eltCtr = viewUtils.getCenterOfProjection();
             viewUtils.popViewportObj();
 
-                        // cache the local to global and global to local matrices
-                        var l2gMat = viewUtils.getLocalToGlobalMatrix( elt );
-                        var g2lMat = glmat4.inverse( l2gMat, [] );
-                        eltCtr = MathUtils.transformAndDivideHomogeneousPoint( eltCtr, l2gMat );
+            // cache the local to global and global to local matrices
+            var l2gMat = viewUtils.getLocalToGlobalMatrix( elt );
+            var g2lMat = glmat4.inverse( l2gMat, [] );
+            eltCtr = MathUtils.transformAndDivideHomogeneousPoint( eltCtr, l2gMat );
 
             elt.elementModel.setProperty("mat", curMat);
             elt.elementModel.setProperty("matInv", curMatInv);
             elt.elementModel.setProperty("ctr", eltCtr);
-                        elt.elementModel.setProperty("l2g", l2gMat);
+            elt.elementModel.setProperty("l2g", l2gMat);
             elt.elementModel.setProperty("g2l", g2lMat);
 
             ElementsMediator.setMatrix(elt, curMat, false, "rotateStage3DTool");
@@ -172,11 +172,11 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
                                         iMat, false, "rotateStage3DTool");
            this.application.ninja.currentDocument.model.documentRoot.elementModel.props3D.m_transformCtr = null;
 
-                        // let the document and stage manager know about the zoom change
-                        stage._firstDraw = true;
-                        this.application.ninja.documentBar.zoomFactor = 100;
+            // let the document and stage manager know about the zoom change
+            stage._firstDraw = true;
+            this.application.ninja.documentBar.zoomFactor = 100;
             this.application.ninja.currentDocument.model.views.design.iframe.style.zoom = 1.0;
-                        stage._firstDraw = false;
+            stage._firstDraw = false;
 
            viewUtils.clearStageTranslation();
            stage.centerStage();
@@ -185,7 +185,7 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
            this.isDrawing = false;
            this.endDraw(event);
 
-//                      this.UpdateSelection(true);
+//          this.UpdateSelection(true);
            this.Configure(true);
        }
     }