diff options
author | Pushkar Joshi | 2012-06-12 07:09:56 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-06-12 07:09:56 -0700 |
commit | fa1dcaaed3d0ed83ef7982ff198dd241c8b9670e (patch) | |
tree | fbd5b770dcbf6a23f2b10971f2485a4ef4451c9f /js/helper-classes | |
parent | 71bc93ad0d53a77d70c688b2b3aacf694dd1de91 (diff) | |
parent | 6854a72504f57903bd5de003e377f2aefb02d0da (diff) | |
download | ninja-fa1dcaaed3d0ed83ef7982ff198dd241c8b9670e.tar.gz |
Merge branch 'master' into pentool
Diffstat (limited to 'js/helper-classes')
-rwxr-xr-x | js/helper-classes/3D/snap-manager.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js index a8b6e739..0157140f 100755 --- a/js/helper-classes/3D/snap-manager.js +++ b/js/helper-classes/3D/snap-manager.js | |||
@@ -496,7 +496,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
496 | this._elementCache = new Array; | 496 | this._elementCache = new Array; |
497 | 497 | ||
498 | // var stage = this.getStage(); | 498 | // var stage = this.getStage(); |
499 | var stage = this.application.ninja.currentSelectedContainer || this.getStage(); | 499 | var stage = this.application.ninja.currentDocument.model.domContainer || this.getStage(); |
500 | this.hLoadElementCache( stage, plane, 0 ); | 500 | this.hLoadElementCache( stage, plane, 0 ); |
501 | this._isCacheInvalid = false; | 501 | this._isCacheInvalid = false; |
502 | 502 | ||
@@ -987,7 +987,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
987 | value: function( screenPt, hitRecs ) { | 987 | value: function( screenPt, hitRecs ) { |
988 | // start at the stage. | 988 | // start at the stage. |
989 | // var stage = this.getStage(); | 989 | // var stage = this.getStage(); |
990 | var stage = this.application.ninja.currentSelectedContainer || this.getStage(); | 990 | var stage = this.application.ninja.currentDocument.model.domContainer || this.getStage(); |
991 | 991 | ||
992 | // the root should be the 'view' canvas, so the first matrix is the camera | 992 | // the root should be the 'view' canvas, so the first matrix is the camera |
993 | viewUtils.setViewportObj( stage ); | 993 | viewUtils.setViewportObj( stage ); |
@@ -1009,7 +1009,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
1009 | } | 1009 | } |
1010 | // hit test the current object | 1010 | // hit test the current object |
1011 | var hit; | 1011 | var hit; |
1012 | var snapToStage = ((depth === 0) && (elt === this.application.ninja.currentSelectedContainer) && (elt.nodeName === 'CANVAS')); | 1012 | var snapToStage = ((depth === 0) && (elt === this.application.ninja.currentDocument.model.domContainer) && (elt.nodeName === 'CANVAS')); |
1013 | if ((depth > 0) || snapToStage) // don't snap to the root unles we are working inside a canvas | 1013 | if ((depth > 0) || snapToStage) // don't snap to the root unles we are working inside a canvas |
1014 | { | 1014 | { |
1015 | // if the element is in the 2D cache snapping is done there | 1015 | // if the element is in the 2D cache snapping is done there |