merge gsoc2008_johan_path2geom into trunk

(bzr r5823)

1 files changed, 1 insertions, 22 deletions

diff --git a/src/live_effects/lpe-test-doEffect-stack.cpp b/src/live_effects/lpe-test-doEffect-stack.cpp
index f3fb346fe..3b578b2c6 100644
--- a/src/live_effects/lpe-test-doEffect-stack.cpp
+++ b/src/live_effects/lpe-test-doEffect-stack.cpp
@@ -45,31 +45,10 @@ LPEdoEffectStackTest::doEffect (SPCurve * curve)
     }
 }
 
-NArtBpath *
-LPEdoEffectStackTest::doEffect_nartbpath (NArtBpath const * path_in)
-{
-    if (step >= 2) {
-        return Effect::doEffect_nartbpath(path_in);
-    } else {
-        // return here
-        NArtBpath *path_out;
-
-        unsigned ret = 0;
-        while ( path_in[ret].code != NR_END ) {
-            ++ret;
-        }
-        unsigned len = ++ret;
-
-        path_out = g_new(NArtBpath, len);
-        memcpy(path_out, path_in, len * sizeof(NArtBpath));
-        return path_out;
-    }
-}
-
 std::vector<Geom::Path>
 LPEdoEffectStackTest::doEffect_path (std::vector<Geom::Path> const & path_in)
 {
-    if (step >= 3) {
+    if (step >= 2) {
         return Effect::doEffect_path(path_in);
     } else {
         // return here