1 files changed, 18 insertions, 6 deletions

diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js
index 8b644d4a..a0d5bc26 100755
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
@@ -47,6 +47,20 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
         }
     },
 
+    _areElementsIn2D : {
+        value: function () {
+            if(this.application.ninja.selectedElements.length) {
+                var len = this.application.ninja.selectedElements.length;
+                for(var i = 0; i < len; i++) {
+                    if(!MathUtils.isIdentityMatrix(this.application.ninja.selectedElements[i].elementModel.getProperty("mat"))) {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+    },
+
     startDraw: {
         value: function(event) {
             this.drawData = null;
@@ -70,7 +84,8 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
             if(this._canSnap)
             {
                 this.initializeSnapping(event);
-                this._use3DMode = !this._areElementsOnSamePlane();
+//                this._use3DMode = !this._areElementsOnSamePlane();
+                this._use3DMode = !this._areElementsIn2D();
 //                console.log("use3DMode = " + this._use3DMode);
             }
             else
@@ -583,11 +598,8 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
                 this.mouseUpHitRec = DrawingToolBase.getUpdatedSnapPoint(point.x, point.y, do3DSnap, this.mouseDownHitRec);
                 if (this._mouseDownHitRec && this._mouseUpHitRec)
                 {
-                    data = this.getDrawingData(event);
-                    if(data)
-                    {
-                        this.modifyElements({pt0:data.mouseDownPos, pt1:data.mouseUpPos}, event);
-                    }
+                    this.modifyElements({pt0:this._mouseDownHitRec.calculateElementScreenPoint(),
+                                            pt1:this._mouseUpHitRec.calculateElementScreenPoint()}, event);
                 }
             }
         }