refactor redrawing code into pen_redraw_all; cancel current unfinished path, inctead...

[inkscape.git] / src / desktop-style.cpp

diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp
index 8a3074e2e3a2aecd7eb680192fd7152e07958018..77fcb4823b30d557cb9d1ea583b51cc3f4a62561 100644 (file)
--- a/src/desktop-style.cpp
+++ b/src/desktop-style.cpp
@@ -14,7 +14,7 @@
 #include "desktop.h"
 #include "color-rgba.h"
 #include "svg/css-ostringstream.h"
-#include "svg/svg.h"
+#include "svg/svg-color.h"
 #include "selection.h"
 #include "sp-tspan.h"
 #include "sp-textpath.h"
@@ -408,7 +408,7 @@ objects_query_fillstroke (GSList *objects, SPStyle *style_res, bool const isfill
             num ++;
         }
 
-       if (paint_res->set && paint->set && paint->type == SP_PAINT_TYPE_PAINTSERVER) { // copy the server
+       if (paint_res->set && paint_effectively_set && paint->type == SP_PAINT_TYPE_PAINTSERVER) { // copy the server
            if (isfill) {
                SP_STYLE_FILL_SERVER (style_res) = SP_STYLE_FILL_SERVER (style);
            } else {