Skip to content
Permalink
Browse files

Feature #8725: fix merge changes

  • Loading branch information
ahuarte47 committed Nov 4, 2013
1 parent 019759a commit 40ed4bbe434472db0d0c9e64ecde72e9e23315f5
Showing with 4 additions and 1 deletion.
  1. +3 −0 src/core/qgsfeaturerequest.cpp
  2. +1 −1 src/core/symbology-ng/qgsfillsymbollayerv2.cpp
@@ -56,6 +56,9 @@ QgsFeatureRequest::QgsFeatureRequest( const QgsExpression& expr )
: mFilter( FilterExpression )
, mFilterExpression( new QgsExpression( expr.dump() ) )
, mFlags( 0 )
, mMapCoordTransform( NULL )
, mMapToPixel( NULL )
, mMapToPixelTol( QgsFeatureRequest::MAPTOPIXEL_THRESHOLD_DEFAULT )
{
}

@@ -681,7 +681,7 @@ void QgsGradientFillSymbolLayerV2::renderPolygon( const QPolygonF& points, QList
p->translate( offset );
}

_renderPolygon( p, points, rings );
_renderPolygon( p, points, rings, context );

if ( !mOffset.isNull() )
{

0 comments on commit 40ed4bb

Please sign in to comment.
You can’t perform that action at this time.