aboutsummaryrefslogtreecommitdiff
path: root/js/stage
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-28 13:33:45 -0800
committerJose Antonio Marquez2012-02-28 13:33:45 -0800
commit933ed4c880128eed80bdc6372eb1dfdb23af4c37 (patch)
tree77a3d7edeefa60d9096b2b3368be11374f354b74 /js/stage
parent6af71de5b80fd531901e82b12372446b569902d8 (diff)
parent7c9291a5bab4abd849547f8878f6fb962fc88250 (diff)
downloadninja-933ed4c880128eed80bdc6372eb1dfdb23af4c37.tar.gz
Merge branch 'refs/heads/NinjaInternal' into FileIO
Diffstat (limited to 'js/stage')
-rwxr-xr-xjs/stage/stage.reel/stage.js2
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 {