Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures

Conflicts:
	js/lib/geom/geom-obj.js
	js/lib/geom/rectangle.js
	js/tools/TagTool.js

1 files changed, 2 insertions, 27 deletions

diff --git a/js/tools/drawing-tool-base.js b/js/tools/drawing-tool-base.js
index 7d97f105..84641754 100755
--- a/js/tools/drawing-tool-base.js
+++ b/js/tools/drawing-tool-base.js
@@ -36,9 +36,8 @@ exports.DrawingToolBase = Montage.create(Montage, {
      *          2 - Y value converted to screen point
      */
     getInitialSnapPoint: {
-        value: function(x, y, shapeCanvas) {
-            snapManager.clearDragPlane();
-
+        value: function(x, y, shapeCanvas)
+                {
             // update the snap settings
                         snapManager.enableSnapAlign( snapManager.snapAlignEnabledAppLevel() );
                         snapManager.enableElementSnap( snapManager.elementSnapEnabledAppLevel() );
@@ -446,30 +445,6 @@ exports.DrawingToolBase = Montage.create(Montage, {
     },
 
     /**
-     * Get the matrix for the actual element being added to the user document.
-     */
-    getElementMatrix: {
-        value: function(planeMat, midPt) {
-            var divMat, flatMat, flatMatSafe;
-            // calculate the matrix for the element.
-            // we should not need to worry about divide by zero below since we snapped to the point
-            divMat = planeMat.slice(0);
-            divMat[12] = 0.0;
-            divMat[13] = 0.0;
-            //divMat[14] = 0.0;
-            divMat[14] = midPt[2];
-
-            // set the left and top of the element such that the center of the rectangle is at the mid point
-            viewUtils.setViewportObj(this.stage);
-
-            flatMat = divMat;
-            flatMatSafe = MathUtils.scientificToDecimal(flatMat, 10);
-
-            return "matrix3d(" + flatMatSafe + ")";
-        }
-    },
-
-    /**
      *  Draw Helper Functions
      */