diff options
| author | Shlomi Fish <shlomif@shlomifish.org> | 2016-12-31 20:30:53 +0000 |
|---|---|---|
| committer | Shlomi Fish <shlomif@shlomifish.org> | 2016-12-31 20:30:53 +0000 |
| commit | edd10ea5b31dffc9f92f9c4860fa9beb23fe4db3 (patch) | |
| tree | ef4c489453f0934eb9966c8fdcc00419aa250b26 /src/live_effects | |
| parent | Merged. (diff) | |
| parent | ruler: Read state flags for GtkStyleContext correctly (diff) | |
| download | inkscape-edd10ea5b31dffc9f92f9c4860fa9beb23fe4db3.tar.gz inkscape-edd10ea5b31dffc9f92f9c4860fa9beb23fe4db3.zip | |
Merged.
(bzr r15369.1.4)
Diffstat (limited to 'src/live_effects')
| -rw-r--r-- | src/live_effects/lpe-copy_rotate.cpp | 2 | ||||
| -rw-r--r-- | src/live_effects/lpe-patternalongpath.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index 3dd35696a..c8f1b9e75 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -259,7 +259,7 @@ LPECopyRotate::setFusion(Geom::PathVector &path_on, Geom::Path divider, double s Geom::Point A = (Geom::Point)origin; Geom::Point B = origin + dir * Geom::Rotate(-Geom::rad_from_deg((rotation_angle*i)+starting_angle)) * size_divider; Geom::Line ls(A,B); - Geom::Affine m = Geom::reflection (ls.vector(), A); + m = Geom::reflection (ls.vector(), A); } else { append_path = original; } diff --git a/src/live_effects/lpe-patternalongpath.cpp b/src/live_effects/lpe-patternalongpath.cpp index e5c9f1be1..c1853ef22 100644 --- a/src/live_effects/lpe-patternalongpath.cpp +++ b/src/live_effects/lpe-patternalongpath.cpp @@ -63,7 +63,7 @@ static const Util::EnumDataConverter<PAPCopyType> PAPCopyTypeConverter(PAPCopyTy LPEPatternAlongPath::LPEPatternAlongPath(LivePathEffectObject *lpeobject) : Effect(lpeobject), pattern(_("Pattern source:"), _("Path to put along the skeleton path"), "pattern", &wr, this, "M0,0 L1,0"), - original_height(0), + original_height(0.0), prop_scale(_("_Width:"), _("Width of the pattern"), "prop_scale", &wr, this, 1.0), copytype(_("Pattern copies:"), _("How many pattern copies to place along the skeleton path"), "copytype", PAPCopyTypeConverter, &wr, this, PAPCT_SINGLE_STRETCHED), |