summaryrefslogtreecommitdiffstats
path: root/src/sp-pattern.cpp
diff options
context:
space:
mode:
authorLiam P. White <inkscapebronyat-signgmaildotcom>2014-05-24 17:42:45 +0000
committerLiam P. White <inkscapebronyat-signgmaildotcom>2014-05-24 17:42:45 +0000
commitbdae8956d539a5c90f56a1f0be7d8924f0bbb21d (patch)
tree890d91ca354bb066883dc86cb1eb73b462134af2 /src/sp-pattern.cpp
parentUpdate to experimental (r13376) (diff)
parentUpdate for working Win64 GDB (devlibs update required) (diff)
downloadinkscape-bdae8956d539a5c90f56a1f0be7d8924f0bbb21d.tar.gz
inkscape-bdae8956d539a5c90f56a1f0be7d8924f0bbb21d.zip
Update to trunk (r13379)
(bzr r13090.1.80)
Diffstat (limited to 'src/sp-pattern.cpp')
-rw-r--r--src/sp-pattern.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/sp-pattern.cpp b/src/sp-pattern.cpp
index 9aa54eadf..9b7330a24 100644
--- a/src/sp-pattern.cpp
+++ b/src/sp-pattern.cpp
@@ -615,9 +615,10 @@ cairo_pattern_t* SPPattern::pattern_new(cairo_t *base_ct, Geom::OptRect const &b
// Content to tile (pattern space)
Geom::Affine content2ps;
- if (this->viewBox_set) {
+ Geom::OptRect effective_view_box = pattern_viewBox(this);
+ if (effective_view_box) {
// viewBox to pattern server (using SPViewBox)
- viewBox = *pattern_viewBox(this);
+ viewBox = *effective_view_box;
c2p.setIdentity();
apply_viewbox( pattern_tile );
content2ps = c2p;