Merge branch 'master' into pentool

Conflicts:
	js/helper-classes/3D/view-utils.js

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, {
                         this.deactivateDragPlane();
 
                         this.setLastHit( rtnHit );
+                        
+                        //rtnHit.test();                // DEBUG CODE.  REMOVE THIS
                         return rtnHit;
                 }
         },
@@ -1086,15 +1088,6 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                 localPt = MathUtils.transformPoint( localPt, inv );
                                 var hitContained = false;
                                 hitContained = this.snapToContainedElements( hitRec, localPt,  globalScrPt );
-
-                                // disable snapping to element bounds when the object isnot selected
-                                if (!hitContained && !this.application.ninja.selectionController.isObjectSelected(elt))
-                                {
-                                        if ((hitRec.getType() == hitRec.SNAP_TYPE_ELEMENT_EDGE) ||
-                                                (hitRec.getType() == hitRec.SNAP_TYPE_ELEMENT_VERTEX) ||
-                                                (hitRec.getType() == hitRec.SNAP_TYPE_ELEMENT))
-                                                hitRec = null;
-                                }
                         }
 
                         return hitRec;