aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/3D/snap-manager.js
diff options
context:
space:
mode:
authorhwc4872012-04-19 13:02:24 -0700
committerhwc4872012-04-19 13:02:24 -0700
commit7d96e0778ed45e131cb5182ac93610ec3f545083 (patch)
tree7991dba229f80acd84f6dcb8ecd9878fe8240fe6 /js/helper-classes/3D/snap-manager.js
parente6a20fe64574763483dc602bd759278ccf5e5e68 (diff)
parent6d33345a9e609e36539d2efa25569f5eeb04a2af (diff)
downloadninja-7d96e0778ed45e131cb5182ac93610ec3f545083.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/helper-classes/3D/snap-manager.js')
-rwxr-xr-xjs/helper-classes/3D/snap-manager.js11
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;