From c1b60947d10a0455b023ae8bbe7b2b4414114ac5 Mon Sep 17 00:00:00 2001
From: Josh Andler <scislac@gmail.com>
Date: Mon, 12 May 2014 15:12:41 -0700
Subject: Patch from Jabierxto to fix a bug I reported off-tracker.

(bzr r13341.3.1)
---
 src/ui/tool/node.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/ui/tool/node.cpp')

diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp
index 1434a5c5b..f077bcffc 100644
--- a/src/ui/tool/node.cpp
+++ b/src/ui/tool/node.cpp
@@ -623,7 +623,7 @@ void Node::move(Geom::Point const &new_pos)
     Node *n = this;
     Node * nextNode = n->nodeToward(n->front());
     Node * prevNode = n->nodeToward(n->back());
-    nodeWeight = _pm().BSplineHandlePosition(n->front());
+    nodeWeight = fmax(_pm().BSplineHandlePosition(n->front()),_pm().BSplineHandlePosition(n->back()));
     if(prevNode){
         if(prevNode->isEndNode()){
             prevNodeWeight = _pm().BSplineHandlePosition(prevNode->front(),prevNode->front());
@@ -659,7 +659,7 @@ void Node::move(Geom::Point const &new_pos)
             if(nextNode->isEndNode()){
                 nextNode->back()->setPosition(_pm().BSplineHandleReposition(nextNode->back(),nextNodeWeight));
             }else{
-                nextNode->back()->setPosition(_pm().BSplineHandleReposition(nextNode->back(),nextNode->back()));
+                nextNode->back()->setPosition(_pm().BSplineHandleReposition(nextNode->back(),nextNode->front()));
             }
         }
     }
-- 
cgit v1.2.3


From 8dbf7bd73db6bb549b3e0be3fba91cddfcb589b8 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Tue, 13 May 2014 07:35:50 +0200
Subject: Fixed a bug in bspline with snaps and 1 sice segments. Pointed by
 LiamW

(bzr r13341.1.12)
---
 src/ui/tool/node.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui/tool/node.cpp')

diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp
index f077bcffc..ed0843b65 100644
--- a/src/ui/tool/node.cpp
+++ b/src/ui/tool/node.cpp
@@ -371,7 +371,7 @@ void Handle::dragged(Geom::Point &new_pos, GdkEventMotion *event)
 
     std::vector<Inkscape::SnapCandidatePoint> unselected;
     //if the snap adjustment is activated and it is not bspline
-    if (snap && !_pm().isBSpline()) {
+    if (snap && !_pm().isBSpline(false)) {
         ControlPointSelection::Set &nodes = _parent->_selection.allPoints();
         for (ControlPointSelection::Set::iterator i = nodes.begin(); i != nodes.end(); ++i) {
             Node *n = static_cast<Node*>(*i);
-- 
cgit v1.2.3