Trunk merge

(bzr r11073.1.15)

1 files changed, 9 insertions, 2 deletions

diff --git a/src/live_effects/parameter/vector.cpp b/src/live_effects/parameter/vector.cpp
index e8725c4b2..3e0ac9092 100644
--- a/src/live_effects/parameter/vector.cpp
+++ b/src/live_effects/parameter/vector.cpp
@@ -137,7 +137,14 @@ VectorParam::set_origin_oncanvas_looks(SPKnotShapeType shape, SPKnotModeType mod
     ori_knot_color = color;
 }
 
-class VectorParamKnotHolderEntity_Origin : public LPEKnotHolderEntity {
+void
+VectorParam::set_oncanvas_color(guint32 color)
+{
+    vec_knot_color = color;
+    ori_knot_color = color;
+}
+
+class VectorParamKnotHolderEntity_Origin : public KnotHolderEntity {
 public:
     VectorParamKnotHolderEntity_Origin(VectorParam *p) : param(p) { }
     virtual ~VectorParamKnotHolderEntity_Origin() {}
@@ -158,7 +165,7 @@ private:
     VectorParam *param;
 };
 
-class VectorParamKnotHolderEntity_Vector : public LPEKnotHolderEntity {
+class VectorParamKnotHolderEntity_Vector : public KnotHolderEntity {
 public:
     VectorParamKnotHolderEntity_Vector(VectorParam *p) : param(p) { }
     virtual ~VectorParamKnotHolderEntity_Vector() {}