Select mesh nodes by clicking on control lines.

(bzr r15267)

4 files changed, 8 insertions, 0 deletions

diff --git a/src/display/sp-ctrlcurve.cpp b/src/display/sp-ctrlcurve.cpp
index 2e0e8105b..79ef20d6c 100644
--- a/src/display/sp-ctrlcurve.cpp
+++ b/src/display/sp-ctrlcurve.cpp
@@ -47,6 +47,8 @@ sp_ctrlcurve_init(SPCtrlCurve *ctrlcurve)
     // Points are initialized to 0,0
     ctrlcurve->rgba = 0x0000ff7f;
     ctrlcurve->item=NULL;
+    ctrlcurve->corner0 = -1;
+    ctrlcurve->corner1 = -1;
 }
 
 namespace {
diff --git a/src/display/sp-ctrlcurve.h b/src/display/sp-ctrlcurve.h
index 847944f38..56b3089d9 100644
--- a/src/display/sp-ctrlcurve.h
+++ b/src/display/sp-ctrlcurve.h
@@ -31,6 +31,9 @@ struct SPCtrlCurve : public SPCtrlLine {
                     Geom::Point const &q2, Geom::Point const &q3);
 
     Geom::Point p0, p1, p2, p3;
+
+    int corner0;  // Used to store index of corner for finding dragger.
+    int corner1;
 };
 
 GType sp_ctrlcurve_get_type();
diff --git a/src/display/sp-ctrlline.cpp b/src/display/sp-ctrlline.cpp
index 6c5674935..c4ced2a33 100644
--- a/src/display/sp-ctrlline.cpp
+++ b/src/display/sp-ctrlline.cpp
@@ -52,6 +52,7 @@ static void sp_ctrlline_init(SPCtrlLine *ctrlline)
     ctrlline->rgba = 0x0000ff7f;
     ctrlline->s[Geom::X] = ctrlline->s[Geom::Y] = ctrlline->e[Geom::X] = ctrlline->e[Geom::Y] = 0.0;
     ctrlline->item=NULL;
+    ctrlline->is_fill = true;
 }
 
 namespace {
diff --git a/src/display/sp-ctrlline.h b/src/display/sp-ctrlline.h
index b2e222437..bac0cfa54 100644
--- a/src/display/sp-ctrlline.h
+++ b/src/display/sp-ctrlline.h
@@ -33,6 +33,8 @@ struct SPCtrlLine : public SPCanvasItem {
 
 
     SPItem *item;  // the item to which this line belongs in some sense; may be NULL for some users
+    bool is_fill;  // fill or stroke... used with meshes.
+
     guint32 rgba;
     Geom::Point s;
     Geom::Point e;