summaryrefslogtreecommitdiffstats
path: root/src/live_effects/effect.cpp
diff options
context:
space:
mode:
authorTavmjong Bah <tavmjong@free.fr>2014-05-09 08:46:15 +0000
committertavmjong-free <tavmjong@free.fr>2014-05-09 08:46:15 +0000
commit6f43db26b0b07cf96664ba2bfbeeb1d622ecd14f (patch)
treead088651637edf691a57860c519a751a8a26d8fb /src/live_effects/effect.cpp
parentStyle rewrite: prevent crash when fill/stroke set to "currentColor". (diff)
parentMerging Jabier's spirolive+bspline branch (diff)
downloadinkscape-6f43db26b0b07cf96664ba2bfbeeb1d622ecd14f.tar.gz
inkscape-6f43db26b0b07cf96664ba2bfbeeb1d622ecd14f.zip
Update to tip.
(bzr r13341.1.2)
Diffstat (limited to 'src/live_effects/effect.cpp')
-rw-r--r--src/live_effects/effect.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index 4c5e21194..9006e5359 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -19,6 +19,7 @@
#include "live_effects/lpe-rough-hatches.h"
#include "live_effects/lpe-dynastroke.h"
#include "live_effects/lpe-test-doEffect-stack.h"
+#include "live_effects/lpe-bspline.h"
#include "live_effects/lpe-gears.h"
#include "live_effects/lpe-curvestitch.h"
#include "live_effects/lpe-circle_with_radius.h"
@@ -120,6 +121,7 @@ const Util::EnumData<EffectType> LPETypeData[] = {
/* 0.49 */
{POWERSTROKE, N_("Power stroke"), "powerstroke"},
{CLONE_ORIGINAL, N_("Clone original path"), "clone_original"},
+ {BSPLINE, N_("BSpline"), "bspline"},
};
const Util::EnumDataConverter<EffectType> LPETypeConverter(LPETypeData, sizeof(LPETypeData)/sizeof(*LPETypeData));
@@ -228,6 +230,9 @@ Effect::New(EffectType lpenr, LivePathEffectObject *lpeobj)
case DOEFFECTSTACK_TEST:
neweffect = static_cast<Effect*> ( new LPEdoEffectStackTest(lpeobj) );
break;
+ case BSPLINE:
+ neweffect = static_cast<Effect*> ( new LPEBSpline(lpeobj) );
+ break;
case DYNASTROKE:
neweffect = static_cast<Effect*> ( new LPEDynastroke(lpeobj) );
break;