diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-03-14 17:28:16 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2016-03-14 17:28:16 +0000 |
| commit | 2fcaf0cdce3c350511710952060235e493488d2c (patch) | |
| tree | f83243f0f57d0aad37bbc2e41918c558b3a3e1fd /src | |
| parent | update to trunk (diff) | |
| parent | Order LPE list (diff) | |
| download | inkscape-2fcaf0cdce3c350511710952060235e493488d2c.tar.gz inkscape-2fcaf0cdce3c350511710952060235e493488d2c.zip | |
update to trunk
(bzr r13708.1.40)
Diffstat (limited to 'src')
| -rw-r--r-- | src/live_effects/effect.cpp | 18 | ||||
| -rw-r--r-- | src/preferences-skeleton.h | 1 | ||||
| -rw-r--r-- | src/ui/tools/measure-tool.cpp | 3 |
3 files changed, 9 insertions, 13 deletions
diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index 2a6edaafb..c8696ea3a 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -132,27 +132,25 @@ const Util::EnumData<EffectType> LPETypeData[] = { /* 0.91 */ {POWERSTROKE, N_("Power stroke"), "powerstroke"}, {CLONE_ORIGINAL, N_("Clone original path"), "clone_original"}, -/* EXPERIMENTAL */ +/* 0.92 */ + {SIMPLIFY, N_("Simplify"), "simplify"}, + {LATTICE2, N_("Lattice Deformation 2"), "lattice2"}, + {PERSPECTIVE_ENVELOPE, N_("Perspective/Envelope"), "perspective-envelope"}, + {FILLET_CHAMFER, N_("Fillet/Chamfer"), "fillet-chamfer"}, + {INTERPOLATE_POINTS, N_("Interpolate points"), "interpolate_points"}, + {TRANSFORM_2PTS, N_("Transform by 2 points"), "transform_2pts"}, {SHOW_HANDLES, N_("Show handles"), "show_handles"}, {ROUGHEN, N_("Roughen"), "roughen"}, {BSPLINE, N_("BSpline"), "bspline"}, {JOIN_TYPE, N_("Join type"), "join_type"}, {TAPER_STROKE, N_("Taper stroke"), "taper_stroke"}, -/* Ponyscape */ +/* Ponyscape -> Inkscape 0.92*/ {ATTACH_PATH, N_("Attach path"), "attach_path"}, {FILL_BETWEEN_STROKES, N_("Fill between strokes"), "fill_between_strokes"}, {FILL_BETWEEN_MANY, N_("Fill between many"), "fill_between_many"}, {ELLIPSE_5PTS, N_("Ellipse by 5 points"), "ellipse_5pts"}, {BOUNDING_BOX, N_("Bounding Box"), "bounding_box"}, -/* 0.91 */ - {SIMPLIFY, N_("Simplify"), "simplify"}, - {LATTICE2, N_("Lattice Deformation 2"), "lattice2"}, - {PERSPECTIVE_ENVELOPE, N_("Perspective/Envelope"), "perspective-envelope"}, - {FILLET_CHAMFER, N_("Fillet/Chamfer"), "fillet-chamfer"}, - {INTERPOLATE_POINTS, N_("Interpolate points"), "interpolate_points"}, -/* 0.92 */ {COPY_ROTATE, N_("Rotate copies"), "copy_rotate"}, - {TRANSFORM_2PTS, N_("Transform by 2 points"), "transform_2pts"}, }; const Util::EnumDataConverter<EffectType> LPETypeConverter(LPETypeData, sizeof(LPETypeData)/sizeof(*LPETypeData)); diff --git a/src/preferences-skeleton.h b/src/preferences-skeleton.h index b428cbe7a..9f2e68b1d 100644 --- a/src/preferences-skeleton.h +++ b/src/preferences-skeleton.h @@ -216,7 +216,6 @@ static char const preferences_skeleton[] = " <group id=\"input\" />\n" " <group id=\"colorpickerwindow\" />\n" " <group id=\"undo-history\" />\n" -" <group id=\"filtereffects\" />\n" " <group id=\"transparency\"\n" " on-focus=\"1.0\"\n" " on-blur=\"0.50\"\n" diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp index a2a440ef4..07edf6039 100644 --- a/src/ui/tools/measure-tool.cpp +++ b/src/ui/tools/measure-tool.cpp @@ -1198,8 +1198,7 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, bool to_phantom, curve->unref(); continue; } - - curve->transform(item->i2doc_affine()); + curve->transform(item->transform); calculate_intersections(desktop, item, lineseg, curve, intersection_times); if (iter == te_get_layout(item)->end()) { |