diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2015-05-18 10:58:20 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2015-05-18 10:58:20 +0000 |
| commit | 6c2374a5e4f15e5b6a673a0cfdb856c4b0e86f10 (patch) | |
| tree | 3cc78e5548b5a4fef797803f4a8452d0e3db7587 /src/desktop-style.cpp | |
| parent | Latvian translation update (diff) | |
| parent | fixed: color icc selector - extra rows on startup (diff) | |
| download | inkscape-6c2374a5e4f15e5b6a673a0cfdb856c4b0e86f10.tar.gz inkscape-6c2374a5e4f15e5b6a673a0cfdb856c4b0e86f10.zip | |
Merge in Tomasz's fill-n-stroke-cppify branch
after fixing inkscape.pot file and conflicts with adding files.
(bzr r14160)
Diffstat (limited to 'src/desktop-style.cpp')
| -rw-r--r-- | src/desktop-style.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp index f25ce8fa8..3bb0ce71a 100644 --- a/src/desktop-style.cpp +++ b/src/desktop-style.cpp @@ -576,8 +576,8 @@ objects_query_fillstroke (const std::vector<SPItem*> &objects, SPStyle *style_re return QUERY_STYLE_MULTIPLE_DIFFERENT; // different kind of server } - SPPattern *pat = pattern_getroot (pattern); - SPPattern *pat_res = pattern_getroot (pattern_res); + SPPattern *pat = SP_PATTERN (server)->rootPattern(); + SPPattern *pat_res = SP_PATTERN (server_res)->rootPattern(); if (pat_res != pat) { return QUERY_STYLE_MULTIPLE_DIFFERENT; // different pattern roots } |