diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-05-06 00:57:18 +0000 |
|---|---|---|
| committer | Jabiertxo Arraiza Zenotz <jtx@jtx.marker.es> | 2013-05-06 00:57:18 +0000 |
| commit | 658579b7ba73d404953808a0b399c747d7724804 (patch) | |
| tree | 8032e88a23b043b876e19eb7ac99663ff96d0a4e /src/desktop-style.cpp | |
| parent | Removed auto select nodes, not decide for the user. Added auto update all sel... (diff) | |
| parent | Fix for 1171434 : trunk: INX <optiongroup> broken^ (diff) | |
| download | inkscape-658579b7ba73d404953808a0b399c747d7724804.tar.gz inkscape-658579b7ba73d404953808a0b399c747d7724804.zip | |
update to trunk
(bzr r11950.1.112)
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 } |