From f2907ae896ed8688e800519310b61754550f27f6 Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Sun, 11 Nov 2012 14:17:53 +0000
Subject: SPObject: drop sp_object_ prefix on class members

(bzr r11869)
---
 src/sp-shape.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/sp-shape.cpp')

diff --git a/src/sp-shape.cpp b/src/sp-shape.cpp
index a9a9c7781..ad73f226c 100644
--- a/src/sp-shape.cpp
+++ b/src/sp-shape.cpp
@@ -146,7 +146,7 @@ void SPShape::sp_shape_finalize(GObject *object)
  *
  * This is to be invoked immediately after creation of an SPShape.
  *
- * \see sp_object_build()
+ * \see SPObject::build()
  */
 void SPShape::sp_shape_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
 {
@@ -167,7 +167,7 @@ void SPShape::sp_shape_build(SPObject *object, SPDocument *document, Inkscape::X
  * by other objects.  This routine also disconnects/unrefs markers and
  * curves attached to it.
  *
- * \see sp_object_release()
+ * \see SPObject::release()
  */
 void SPShape::sp_shape_release(SPObject *object)
 {
-- 
cgit v1.2.3


From d0d3e7f80dafc80e47c9a95bf31c14283010a2c2 Mon Sep 17 00:00:00 2001
From: Diederik van Lierop <mail@diedenrezi.nl>
Date: Sat, 8 Dec 2012 21:29:18 +0100
Subject: Selector tool: improve responsiveness for snapping a path's internal
 intersections (was unbearable already for paths having 20+ segments)

(bzr r11937)
---
 src/sp-shape.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/sp-shape.cpp')

diff --git a/src/sp-shape.cpp b/src/sp-shape.cpp
index ad73f226c..d5556ba9e 100644
--- a/src/sp-shape.cpp
+++ b/src/sp-shape.cpp
@@ -1193,10 +1193,10 @@ void SPShape::sp_shape_snappoints(SPItem const *item, std::vector<Inkscape::Snap
 
         // Find the internal intersections of each path and consider these for snapping
         // (using "Method 1" as described in Inkscape::ObjectSnapper::_collectNodes())
-        if (snapprefs->isTargetSnappable(Inkscape::SNAPTARGET_PATH_INTERSECTION)) {
+        if (snapprefs->isTargetSnappable(Inkscape::SNAPTARGET_PATH_INTERSECTION) || snapprefs->isSourceSnappable(Inkscape::SNAPSOURCE_PATH_INTERSECTION)) {
             Geom::Crossings cs;
             try {
-                cs = self_crossings(*path_it);
+                cs = self_crossings(*path_it); // This can be slow!
                 if (!cs.empty()) { // There might be multiple intersections...
                     for (Geom::Crossings::const_iterator i = cs.begin(); i != cs.end(); ++i) {
                         Geom::Point p_ix = (*path_it).pointAt((*i).ta);
-- 
cgit v1.2.3