From 4b6620f3ed40dadba7f517f8321dedacbe48d393 Mon Sep 17 00:00:00 2001
From: Diederik van Lierop <mailat-signdiedenrezidotnl>
Date: Sun, 24 Oct 2010 13:14:28 +0200
Subject: Fix paraxial pen tool: apply constraint even if we didn't snap

(bzr r9847)
---
 src/snap.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/snap.cpp')

diff --git a/src/snap.cpp b/src/snap.cpp
index cac3824ab..e14ef6ae9 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -179,7 +179,7 @@ void SnapManager::freeSnapReturnByRef(Geom::Point &p,
                                       Geom::OptRect const &bbox_to_snap) const
 {
     Inkscape::SnappedPoint const s = freeSnap(Inkscape::SnapCandidatePoint(p, source_type), bbox_to_snap);
-    s.getPoint(p);
+    s.getPointIfSnapped(p);
 }
 
 
@@ -343,7 +343,7 @@ void SnapManager::constrainedSnapReturnByRef(Geom::Point &p,
                                              Geom::OptRect const &bbox_to_snap) const
 {
     Inkscape::SnappedPoint const s = constrainedSnap(Inkscape::SnapCandidatePoint(p, source_type), constraint, bbox_to_snap);
-    s.getPoint(p);
+    p = s.getPoint(); // If we didn't snap, then we will return the point projected onto the constraint
 }
 
 /**
@@ -498,7 +498,7 @@ void SnapManager::guideFreeSnap(Geom::Point &p, Geom::Point const &guide_normal,
 
     Inkscape::SnappedPoint const s = findBestSnap(candidate, sc, false, false);
 
-    s.getPoint(p);
+    s.getPointIfSnapped(p);
 }
 
 /**
@@ -542,7 +542,7 @@ void SnapManager::guideConstrainedSnap(Geom::Point &p, SPGuide const &guideline)
     }
 
     Inkscape::SnappedPoint const s = findBestSnap(candidate, sc, false);
-    s.getPoint(p);
+    s.getPointIfSnapped(p);
 }
 
 /**
-- 
cgit v1.2.3