Merge branch 'refs/heads/ninja-internal' into EricMerge

Conflicts:
	js/tools/Rotate3DToolBase.js
	js/tools/RotateStage3DTool.js
	js/tools/Translate3DToolBase.js
	js/tools/modifier-tool-base.js

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

1 files changed, 23 insertions, 35 deletions

diff --git a/js/controllers/elements/stage-controller.js b/js/controllers/elements/stage-controller.js
index f376e40f..3ef7dacc 100755
--- a/js/controllers/elements/stage-controller.js
+++ b/js/controllers/elements/stage-controller.js
@@ -31,46 +31,34 @@ exports.StageController = Montage.create(ElementController, {
         }
     },
 
+
     // TODO - perspective distance needs to be passed in as "dist" and matrix3d needs to be passed in as "mat"
     set3DProperties: {
-        value: function(el, props, index, update3DModel) {
-            var dist = props[index]["dist"],
-                mat = props[index]["mat"];
-            this.application.ninja.stylesController.setElementStyle(el,
-                                                                    "-webkit-transform",
-                                                                    "perspective(" + dist + ") " +
-                                                                    "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")",
-                                                                    true);
-
-            el.elementModel.props3D.matrix3d = mat;
-            el.elementModel.props3D.perspectiveDist = dist;
-
-            // TODO - Move this to matrix class
-            if(this._isRotated(mat))
-            {
-                this.application.ninja.currentDocument.stageBG.style.display = "none";
-            }
-            else
-            {
-                this.application.ninja.stylesController.setElementStyle(this.application.ninja.currentDocument.stageBG,
-                                                                        "-webkit-transform",
-                                                                        "perspective(" + dist + ") " +
-                                                                        "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")",
-                                                                        true);
-
-                this.application.ninja.currentDocument.stageBG.elementModel.props3D.matrix3d = mat;
-                this.application.ninja.currentDocument.stageBG.elementModel.props3D.perspectiveDist = dist;
-                this.application.ninja.currentDocument.stageBG.style.display = "block";
-            }
+            value: function(el, props, update3DModel) {
+                var dist = props["dist"], mat = props["mat"];
+                this.application.ninja.stylesController.setElementStyle(el, "-webkit-transform", "perspective(" + dist + ") " + "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")", true);
+
+                el.elementModel.props3D.matrix3d = mat;
+                el.elementModel.props3D.perspectiveDist = dist;
 
-            this.application.ninja.stage.updatedStage = true;
+                // TODO - Move this to matrix class
+                if(this._isRotated(mat)) {
+                    this.application.ninja.currentDocument.stageBG.style.display = "none";
+                } else {
+                    this.application.ninja.stylesController.setElementStyle(this.application.ninja.currentDocument.stageBG, "-webkit-transform", "perspective(" + dist + ") " + "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")", true);
 
-            if(update3DModel)
-            {
-                this._update3DProperties(el, mat, dist);
+                    this.application.ninja.currentDocument.stageBG.elementModel.props3D.matrix3d = mat;
+                    this.application.ninja.currentDocument.stageBG.elementModel.props3D.perspectiveDist = dist;
+                    this.application.ninja.currentDocument.stageBG.style.display = "block";
+                }
+
+                this.application.ninja.stage.updatedStage = true;
+
+                if(update3DModel) {
+                    this._update3DProperties(el, mat, dist);
+                }
             }
-        }
-    },
+        },
 
     getProperty: {
         value: function(el, p) {