diff options
| author | Nivesh Rajbhandari | 2012-02-22 16:41:00 -0800 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-02-22 16:41:00 -0800 |
| commit | 5272d5585b0fbae233d829ac9a9b5207838ec74c (patch) | |
| tree | a6420c0b47875205624ec5de55d9b0968f63bf9a /js/stage | |
| parent | 7b9b1e6dab88875b85230fc6f4fa0fca94e8b82f (diff) | |
| parent | 3285038757aed8bf200fb6a97ebbf2f49a998869 (diff) | |
| download | ninja-5272d5585b0fbae233d829ac9a9b5207838ec74c.tar.gz | |
Merge branch 'refs/heads/ToolFixes' into WebGLMaterials
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 79a57f22..641ac247 100755 --- a/js/stage/stage.reel/stage.js +++ b/js/stage/stage.reel/stage.js | |||
| @@ -519,7 +519,7 @@ exports.Stage = Montage.create(Component, { | |||
| 519 | elt = this.application.ninja.currentDocument.GetElementFromPoint(point.x + this.scrollLeft,point.y + this.scrollTop); | 519 | elt = this.application.ninja.currentDocument.GetElementFromPoint(point.x + this.scrollLeft,point.y + this.scrollTop); |
| 520 | 520 | ||
| 521 | // workaround Chrome 3d bug | 521 | // workaround Chrome 3d bug |
| 522 | if(elt === this._viewport) | 522 | if(this.application.ninja.currentDocument.inExclusion(elt) !== -1) |
| 523 | { | 523 | { |
| 524 | return this._getElementUsingSnapping(point); | 524 | return this._getElementUsingSnapping(point); |
| 525 | } else { | 525 | } else { |