diff options
author | Ananya Sen | 2012-04-23 10:53:45 -0700 |
---|---|---|
committer | Ananya Sen | 2012-04-23 10:53:45 -0700 |
commit | 6e2d8c8b7e981de2a7ede45d707614307e811cad (patch) | |
tree | 94d5455c90439548c89d811a03d675e94cf5d27c /js/helper-classes/3D/snap-manager.js | |
parent | 2fafe26f74f342388b97960e7a58e3f45d8d961f (diff) | |
parent | 5a0331fc26fcc2cdc6200086109e34440a2dec6a (diff) | |
download | ninja-6e2d8c8b7e981de2a7ede45d707614307e811cad.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
Diffstat (limited to 'js/helper-classes/3D/snap-manager.js')
-rwxr-xr-x | js/helper-classes/3D/snap-manager.js | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js index 02e81a62..cd8cc102 100755 --- a/js/helper-classes/3D/snap-manager.js +++ b/js/helper-classes/3D/snap-manager.js | |||
@@ -306,6 +306,8 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
306 | this.deactivateDragPlane(); | 306 | this.deactivateDragPlane(); |
307 | 307 | ||
308 | this.setLastHit( rtnHit ); | 308 | this.setLastHit( rtnHit ); |
309 | |||
310 | //rtnHit.test(); // DEBUG CODE. REMOVE THIS | ||
309 | return rtnHit; | 311 | return rtnHit; |
310 | } | 312 | } |
311 | }, | 313 | }, |
@@ -1086,15 +1088,6 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
1086 | localPt = MathUtils.transformPoint( localPt, inv ); | 1088 | localPt = MathUtils.transformPoint( localPt, inv ); |
1087 | var hitContained = false; | 1089 | var hitContained = false; |
1088 | hitContained = this.snapToContainedElements( hitRec, localPt, globalScrPt ); | 1090 | hitContained = this.snapToContainedElements( hitRec, localPt, globalScrPt ); |
1089 | |||
1090 | // disable snapping to element bounds when the object isnot selected | ||
1091 | if (!hitContained && !this.application.ninja.selectionController.isObjectSelected(elt)) | ||
1092 | { | ||
1093 | if ((hitRec.getType() == hitRec.SNAP_TYPE_ELEMENT_EDGE) || | ||
1094 | (hitRec.getType() == hitRec.SNAP_TYPE_ELEMENT_VERTEX) || | ||
1095 | (hitRec.getType() == hitRec.SNAP_TYPE_ELEMENT)) | ||
1096 | hitRec = null; | ||
1097 | } | ||
1098 | } | 1091 | } |
1099 | 1092 | ||
1100 | return hitRec; | 1093 | return hitRec; |