summaryrefslogtreecommitdiffstats
path: root/src/sp-star.cpp
diff options
context:
space:
mode:
authorLiam P. White <inkscapebrony@gmail.com>2014-08-06 18:43:09 +0000
committerLiam P. White <inkscapebrony@gmail.com>2014-08-06 18:43:09 +0000
commitb7c253a177de4edc08593676647d0c9d1c9f5206 (patch)
tree8d4fc47028de23246be1eed3d2ada5cf72716be4 /src/sp-star.cpp
parentI'm an idiot (diff)
parentUpdate to trunk r13497 (diff)
downloadinkscape-b7c253a177de4edc08593676647d0c9d1c9f5206.tar.gz
inkscape-b7c253a177de4edc08593676647d0c9d1c9f5206.zip
Update to experimental r13460
(bzr r13090.1.98)
Diffstat (limited to 'src/sp-star.cpp')
-rw-r--r--src/sp-star.cpp8
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;