fix #5678 (old labeling does not work with rule-based rendering)

wonder-sk · wonder-sk · commit cd97d8235ed1 · 2012-05-31T20:38:38.000+02:00
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -362,7 +362,7 @@ void QgsVectorLayer::drawLabels( QgsRenderContext& rendererContext )
       while ( nextFeature( fet ) )
       {
         if (( mRenderer && mRenderer->willRenderFeature( &fet ) )
-            || ( mRendererV2 && mRendererV2->symbolForFeature( fet ) != NULL ) )
+            || ( mRendererV2 && mRendererV2->willRenderFeature( fet ) ) )
         {
           bool sel = mSelectedFeatureIds.contains( fet.id() );
           mLabel->renderLabel( rendererContext, fet, sel, 0 );

Original file line number	Diff line number	Diff line change
`@@ -362,7 +362,7 @@ void QgsVectorLayer::drawLabels( QgsRenderContext& rendererContext )`
`362`	`362`	`while ( nextFeature( fet ) )`
`363`	`363`	`{`
`364`	`364`	`if (( mRenderer && mRenderer->willRenderFeature( &fet ) )`
`365`		`- \|\| ( mRendererV2 && mRendererV2->symbolForFeature( fet ) != NULL ) )`
	`365`	`+ \|\| ( mRendererV2 && mRendererV2->willRenderFeature( fet ) ) )`
`366`	`366`	`{`
`367`	`367`	`bool sel = mSelectedFeatureIds.contains( fet.id() );`
`368`	`368`	`mLabel->renderLabel( rendererContext, fet, sel, 0 );`