diff options
| author | Jose Antonio Marquez | 2012-02-28 13:33:17 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-28 13:33:17 -0800 |
| commit | f7c08fe5a8424d8c7837a4e3a975e63bcddc3b14 (patch) | |
| tree | 77a3d7edeefa60d9096b2b3368be11374f354b74 /js/stage | |
| parent | 811d5092345bf520f6a683eec89cf7d8ed7aa490 (diff) | |
| parent | 7c9291a5bab4abd849547f8878f6fb962fc88250 (diff) | |
| download | ninja-f7c08fe5a8424d8c7837a4e3a975e63bcddc3b14.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into FileIO-Build-Candidate
Diffstat (limited to 'js/stage')
| -rwxr-xr-x | js/stage/stage.reel/stage.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js index 9784f14d..4c1d046b 100755 --- a/js/stage/stage.reel/stage.js +++ b/js/stage/stage.reel/stage.js | |||
| @@ -523,7 +523,7 @@ exports.Stage = Montage.create(Component, { | |||
| 523 | elt = this.application.ninja.currentDocument.GetElementFromPoint(point.x + this.scrollLeft,point.y + this.scrollTop); | 523 | elt = this.application.ninja.currentDocument.GetElementFromPoint(point.x + this.scrollLeft,point.y + this.scrollTop); |
| 524 | 524 | ||
| 525 | // workaround Chrome 3d bug | 525 | // workaround Chrome 3d bug |
| 526 | if(this.application.ninja.currentDocument.inExclusion(elt) !== -1) | 526 | if(this.application.ninja.toolsData.selectedToolInstance._canSnap && this.application.ninja.currentDocument.inExclusion(elt) !== -1) |
| 527 | { | 527 | { |
| 528 | return this._getElementUsingSnapping(point); | 528 | return this._getElementUsingSnapping(point); |
| 529 | } else { | 529 | } else { |