diff options
author | Ananya Sen | 2012-02-29 14:53:13 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-29 14:53:13 -0800 |
commit | 5d4f1aad01737695238582c704e6d4f2c3a2f317 (patch) | |
tree | bf202a3432e3cfa928a57ee80d54af91b9e2509a /js/stage | |
parent | ccedeef38d6eb2e55d1782b82401828f3c99dd9c (diff) | |
parent | 551e1f2be11e9e6ab7af17816396b88aafd57dff (diff) | |
download | ninja-5d4f1aad01737695238582c704e6d4f2c3a2f317.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into FileIO
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 { |