diff options
| author | Matthew Petroff <matthew@mpetroff.net> | 2013-09-15 19:26:40 +0000 |
|---|---|---|
| committer | Matthew Petroff <matthew@mpetroff.net> | 2013-09-15 19:26:40 +0000 |
| commit | d0f046b0aff8b4404c852990886f9afeca6d5c0f (patch) | |
| tree | 9f03e5af0f2126a7d9cd7a7d11d61b5b99e16a3a /src/sp-pattern.cpp | |
| parent | Fix document unit change for disconnected connectors. (diff) | |
| parent | Dutch translation update (diff) | |
| download | inkscape-d0f046b0aff8b4404c852990886f9afeca6d5c0f.tar.gz inkscape-d0f046b0aff8b4404c852990886f9afeca6d5c0f.zip | |
Merge from trunk.
(bzr r12475.1.20)
Diffstat (limited to 'src/sp-pattern.cpp')
| -rw-r--r-- | src/sp-pattern.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/sp-pattern.cpp b/src/sp-pattern.cpp index 62811d51a..b8368a416 100644 --- a/src/sp-pattern.cpp +++ b/src/sp-pattern.cpp @@ -616,13 +616,13 @@ sp_pattern_create_pattern(SPPaintServer *ps, // viewBox to pattern server Geom::Affine vb2ps = Geom::identity(); - if (pat->viewBox_set) { - Geom::Rect vb = *pattern_viewBox(pat); - gdouble tmp_x = pattern_width (pat) / vb.width(); - gdouble tmp_y = pattern_height (pat) / vb.height(); + if (shown->viewBox_set) { + Geom::Rect vb = *pattern_viewBox(shown); + gdouble tmp_x = pattern_width (shown) / vb.width(); + gdouble tmp_y = pattern_height (shown) / vb.height(); // FIXME: preserveAspectRatio must be taken into account here too! - vb2ps = Geom::Affine(tmp_x, 0.0, 0.0, tmp_y, pattern_x(pat) - vb.left() * tmp_x, pattern_y(pat) - vb.top() * tmp_y); + vb2ps = Geom::Affine(tmp_x, 0.0, 0.0, tmp_y, pattern_x(shown) - vb.left() * tmp_x, pattern_y(shown) - vb.top() * tmp_y); } // We must determine the size and scaling of the pattern at the time it is displayed and render |