- do not use shift to disable snapping while holding shift to rotate a guide

- snap guides to paths too
- always show the same snap indicator

(bzr r9625)

1 files changed, 1 insertions, 2 deletions

diff --git a/src/snap.cpp b/src/snap.cpp
index 1127ccba1..ccaf3dee3 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -430,8 +430,7 @@ void SnapManager::guideFreeSnap(Geom::Point &p, Geom::Point const &guide_normal,
         (*i)->freeSnap(sc, candidate, Geom::OptRect(), NULL, NULL);
     }
 
-    // Snap to intersections of curves, but not to the curves themselves! (see _snapTranslatingGuideToNodes in object-snapper.cpp)
-    Inkscape::SnappedPoint const s = findBestSnap(candidate, sc, false, true);
+    Inkscape::SnappedPoint const s = findBestSnap(candidate, sc, false, false);
 
     s.getPoint(p);
 }