diff options
| author | Liam P. White <inkscapebrony@gmail.com> | 2014-08-06 18:38:03 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebrony@gmail.com> | 2014-08-06 18:38:03 +0000 |
| commit | e747c89c1d1579d2dd478bfcdc448efd09438371 (patch) | |
| tree | 706654eeabb6c28af7dc93463f2ad9b75b564cfc /src/sp-star.cpp | |
| parent | Fix bug #1241501, improve tooltip text on path parameter (diff) | |
| parent | Fix for bug #1327267 (excessive calls to sp_style_read_from_prefs) (diff) | |
| download | inkscape-e747c89c1d1579d2dd478bfcdc448efd09438371.tar.gz inkscape-e747c89c1d1579d2dd478bfcdc448efd09438371.zip | |
Update to trunk r13497
(bzr r13341.1.119)
Diffstat (limited to 'src/sp-star.cpp')
| -rw-r--r-- | src/sp-star.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/sp-star.cpp b/src/sp-star.cpp index eac33ed7b..712029468 100644 --- a/src/sp-star.cpp +++ b/src/sp-star.cpp @@ -513,10 +513,12 @@ void SPStar::snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape:: } } -Geom::Affine SPStar::set_transform(Geom::Affine const &xform) +Geom::Affine SPStar::set_transform(Geom::Affine const &tform) { + Geom::Affine xform = (randomized == 0 ? tform.withoutTranslation() : tform); + // Only set transform with proportional scaling - if (!xform.withoutTranslation().isUniformScale()) { + if (!xform.isUniformScale()) { return xform; } @@ -530,7 +532,7 @@ Geom::Affine SPStar::set_transform(Geom::Affine const &xform) /* This function takes care of translation and scaling, we return whatever parts we can't handle. */ - Geom::Affine ret(Geom::Affine(xform).withoutTranslation()); + Geom::Affine ret(xform); gdouble const s = hypot(ret[0], ret[1]); if (s > 1e-9) { ret[0] /= s; |