Always clear pen/brush before drawing layer effects (fix #15696)

qgis · Oct 16, 2016 · 55f2071 · 55f2071
1 parent 6c53641
commit 55f2071
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/core/effects/qgspainteffect.cpp b/src/core/effects/qgspainteffect.cpp
@@ -163,6 +163,11 @@ void QgsPaintEffect::end( QgsRenderContext &context )
   context.setPainter( mPrevPainter );
   mPrevPainter = nullptr;
 
+  // clear any existing pen/brush - sometimes these are not correctly restored when restoring a painter
+  // with a QPicture destination - see #15696
+  context.painter()->setPen( Qt::NoPen );
+  context.painter()->setBrush( Qt::NoBrush );
+
   //draw using effect
   render( *mTempPicture, context );