aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/3D
diff options
context:
space:
mode:
authorAnanya Sen2012-06-12 12:09:45 -0700
committerAnanya Sen2012-06-12 12:09:45 -0700
commit3389cd085555e188800f337525c0fc8884084c04 (patch)
tree3899c1c4b8bce4ec3c05fb4b8f6f3824cd82188d /js/helper-classes/3D
parent1e7f318e7bbc0c3cd95217fc369ccc30963a5381 (diff)
parent6854a72504f57903bd5de003e377f2aefb02d0da (diff)
downloadninja-3389cd085555e188800f337525c0fc8884084c04.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'js/helper-classes/3D')
-rwxr-xr-xjs/helper-classes/3D/snap-manager.js6
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