aboutsummaryrefslogtreecommitdiff
path: root/js/tools/SelectionTool.js
diff options
context:
space:
mode:
authorKruti Shah2012-06-20 15:12:48 -0700
committerKruti Shah2012-06-20 15:12:48 -0700
commit1fe1202ba87d6de9b0f0d8efee78f955c5350210 (patch)
tree26ff4c6c5a94accfd5801f124244d3eef152a5c7 /js/tools/SelectionTool.js
parent1ce4bd7033a413c7697888e5712f278219d6d095 (diff)
parent782b66c783df4a9c36fa240cc77900e69b9130cf (diff)
downloadninja-1fe1202ba87d6de9b0f0d8efee78f955c5350210.tar.gz
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'js/tools/SelectionTool.js')
-rwxr-xr-xjs/tools/SelectionTool.js7
1 files changed, 2 insertions, 5 deletions
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js
index 8b644d4a..9bd885a4 100755
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
@@ -583,11 +583,8 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
583 this.mouseUpHitRec = DrawingToolBase.getUpdatedSnapPoint(point.x, point.y, do3DSnap, this.mouseDownHitRec); 583 this.mouseUpHitRec = DrawingToolBase.getUpdatedSnapPoint(point.x, point.y, do3DSnap, this.mouseDownHitRec);
584 if (this._mouseDownHitRec && this._mouseUpHitRec) 584 if (this._mouseDownHitRec && this._mouseUpHitRec)
585 { 585 {
586 data = this.getDrawingData(event); 586 this.modifyElements({pt0:this._mouseDownHitRec.calculateElementScreenPoint(),
587 if(data) 587 pt1:this._mouseUpHitRec.calculateElementScreenPoint()}, event);
588 {
589 this.modifyElements({pt0:data.mouseDownPos, pt1:data.mouseUpPos}, event);
590 }
591 } 588 }
592 } 589 }
593 } 590 }