updated to latest trunk

(bzr r14876.2.4)

1 files changed, 36 insertions, 37 deletions

diff --git a/src/live_effects/effect-enum.h b/src/live_effects/effect-enum.h
index 0f770b0ad..71d669bf6 100644
--- a/src/live_effects/effect-enum.h
+++ b/src/live_effects/effect-enum.h
@@ -16,57 +16,56 @@ namespace LivePathEffect {
 
 enum EffectType {
     BEND_PATH = 0,
+    GEARS,
     PATTERN_ALONG_PATH,
-    FREEHAND_SHAPE,
-    SKETCH,
-    ROUGH_HATCHES,
+    CURVE_STITCH,
     VONKOCH,
     KNOT,
-    GEARS,
-    CURVE_STITCH,
-    CIRCLE_WITH_RADIUS,
-    PERSPECTIVE_PATH,
+    CONSTRUCT_GRID,
     SPIRO,
-    LATTICE,
-    LATTICE2,
-    ROUGHEN,
-    SHOW_HANDLES,
-    SIMPLIFY,
     ENVELOPE,
-    CONSTRUCT_GRID,
-    PERP_BISECTOR,
-    TANGENT_TO_CURVE,
-    MIRROR_SYMMETRY,
-    CIRCLE_3PTS,
-    TRANSFORM_2PTS,
-    ANGLE_BISECTOR,
-    PARALLEL,
-    COPY_ROTATE,
-    OFFSET,
-    RULER,
-    BOOLOPS,
     INTERPOLATE,
-    INTERPOLATE_POINTS,
-    TEXT_LABEL,
-    PATH_LENGTH,
-    LINE_SEGMENT,
-    DOEFFECTSTACK_TEST,
-    BSPLINE,
-    DYNASTROKE,
-    RECURSIVE_SKELETON,
-    EXTRUDE,
+    ROUGH_HATCHES,
+    SKETCH,
+    RULER,
     POWERSTROKE,
     CLONE_ORIGINAL,
+    SIMPLIFY,
+    LATTICE2,
+    PERSPECTIVE_ENVELOPE,
+    INTERPOLATE_POINTS,
+    TRANSFORM_2PTS,
+    SHOW_HANDLES,
+    ROUGHEN,
+    BSPLINE,
+    JOIN_TYPE,
+    TAPER_STROKE,
+    MIRROR_SYMMETRY,
+    COPY_ROTATE,
+    BOOL_OP,
     ATTACH_PATH,
     FILL_BETWEEN_STROKES,
     FILL_BETWEEN_MANY,
     ELLIPSE_5PTS,
     BOUNDING_BOX,
-    JOIN_TYPE,
-    TAPER_STROKE,
-    PERSPECTIVE_ENVELOPE,
+    MEASURE_LINE,
     FILLET_CHAMFER,
-    BOOL_OP,
+    DOEFFECTSTACK_TEST,
+    ANGLE_BISECTOR,
+    CIRCLE_WITH_RADIUS,
+    CIRCLE_3PTS,
+    DYNASTROKE,
+    EXTRUDE,
+    LATTICE,
+    LINE_SEGMENT,
+    OFFSET,
+    PARALLEL,
+    PATH_LENGTH,
+    PERP_BISECTOR,
+    PERSPECTIVE_PATH,
+    RECURSIVE_SKELETON,
+    TANGENT_TO_CURVE,
+    TEXT_LABEL,
     INVALID_LPE // This must be last (I made it such that it is not needed anymore I think..., Don't trust on it being last. - johan)
 };