Fix bad fills when using marker line with render effects (fix #15696)

nyalldawson · nyalldawson · commit d1aff824f726 · 2016-10-17T15:25:27.000+10:00
(cherry-picked from a0bfc10, 55f207)
diff --git a/src/core/effects/qgspainteffect.cpp b/src/core/effects/qgspainteffect.cpp
@@ -162,6 +162,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 );
 
diff --git a/src/core/symbology-ng/qgslinesymbollayerv2.cpp b/src/core/symbology-ng/qgslinesymbollayerv2.cpp
@@ -885,6 +885,9 @@ void QgsMarkerLineSymbolLayerV2::renderPolyline( const QPolygonF& points, QgsSym
     }
   }
 
+
+  context.renderContext().painter()->save();
+
   if ( qgsDoubleNear( offset, 0.0 ) )
   {
     if ( placement == Interval )
@@ -911,6 +914,8 @@ void QgsMarkerLineSymbolLayerV2::renderPolyline( const QPolygonF& points, QgsSym
         renderPolylineVertex( points2, context, placement );
     }
   }
+
+  context.renderContext().painter()->restore();
 }
 
 void QgsMarkerLineSymbolLayerV2::renderPolygonOutline( const QPolygonF& points, QList<QPolygonF>* rings, QgsSymbolV2RenderContext& context )

Original file line number	Diff line number	Diff line change
`@@ -885,6 +885,9 @@ void QgsMarkerLineSymbolLayerV2::renderPolyline( const QPolygonF& points, QgsSym`
`885`	`885`	`}`
`886`	`886`	`}`
`887`	`887`
	`888`	`+`
	`889`	`+ context.renderContext().painter()->save();`
	`890`	`+`
`888`	`891`	`if ( qgsDoubleNear( offset, 0.0 ) )`
`889`	`892`	`{`
`890`	`893`	`if ( placement == Interval )`
`@@ -911,6 +914,8 @@ void QgsMarkerLineSymbolLayerV2::renderPolyline( const QPolygonF& points, QgsSym`
`911`	`914`	`renderPolylineVertex( points2, context, placement );`
`912`	`915`	`}`
`913`	`916`	`}`
	`917`	`+`
	`918`	`+ context.renderContext().painter()->restore();`
`914`	`919`	`}`
`915`	`920`
`916`	`921`	`void QgsMarkerLineSymbolLayerV2::renderPolygonOutline( const QPolygonF& points, QList<QPolygonF>* rings, QgsSymbolV2RenderContext& context )`