Fix data defined rendering for rulebased/inverted polygon renderers

fix #13318
qgis · Sep 3, 2015 · bef84dc · bef84dc
1 parent 086a007
commit bef84dc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/core/symbology-ng/qgsinvertedpolygonrenderer.cpp b/src/core/symbology-ng/qgsinvertedpolygonrenderer.cpp
@@ -288,7 +288,10 @@ void QgsInvertedPolygonRenderer::stopRender( QgsRenderContext& context )
       feat.setGeometry( QgsGeometry::fromMultiPolygon( finalMulti ) );
     }
     if ( feat.constGeometry() )
+    {
+      mContext.expressionContext().setFeature( feat );
       mSubRenderer->renderFeature( feat, mContext );
+    }
   }
   for ( FeatureCategoryVector::iterator cit = mFeaturesCategories.begin(); cit != mFeaturesCategories.end(); ++cit )
   {

diff --git a/src/core/symbology-ng/qgsrulebasedrendererv2.cpp b/src/core/symbology-ng/qgsrulebasedrendererv2.cpp
@@ -859,6 +859,7 @@ void QgsRuleBasedRendererV2::stopRender( QgsRenderContext& context )
     // go through all jobs at the level
     foreach ( const RenderJob* job, level.jobs )
     {
+      context.expressionContext().setFeature( job->ftr.feat );
       //QgsDebugMsg(QString("job fid %1").arg(job->f->id()));
       // render feature - but only with symbol layers with specified zIndex
       QgsSymbolV2* s = job->symbol;