diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2013-05-05 11:58:23 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2013-05-05 11:58:23 +0000 |
| commit | 129e599f69d69970d27f827159d563d58c7831b9 (patch) | |
| tree | fa15e756067f688a61f39da90793d4da90ea0176 /src/desktop-style.cpp | |
| parent | merge from trunk (r12305) (diff) | |
| parent | Fix for 1171434 : trunk: INX <optiongroup> broken^ (diff) | |
| download | inkscape-129e599f69d69970d27f827159d563d58c7831b9.tar.gz inkscape-129e599f69d69970d27f827159d563d58c7831b9.zip | |
merge from trunk (r12322)
(bzr r11668.1.69)
Diffstat (limited to 'src/desktop-style.cpp')
| -rw-r--r-- | src/desktop-style.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp index 40132ec58..c632f9033 100644 --- a/src/desktop-style.cpp +++ b/src/desktop-style.cpp @@ -501,7 +501,8 @@ objects_query_fillstroke (GSList *objects, SPStyle *style_res, bool const isfill || SP_IS_FLOWTSPAN(parent) || SP_IS_FLOWLINE(parent)); // 1. Bail out with QUERY_STYLE_MULTIPLE_DIFFERENT if necessary - + + // cppcheck-suppress comparisonOfBoolWithInt if ((!paintImpossible) && (!paint->isSameType(*paint_res) || (paint_res->set != paint_effectively_set))) { return QUERY_STYLE_MULTIPLE_DIFFERENT; // different types of paint } |