Small efficiency improvement for rendering

mhugent · timlinux · commit 7a4602b04ae0 · 2011-09-07T22:48:58.000+02:00
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -832,6 +832,11 @@ void QgsVectorLayer::drawRendererV2Levels( QgsRenderContext& rendererContext, bo
     }
 #endif //Q_WS_MAC
     QgsSymbolV2* sym = mRendererV2->symbolForFeature( fet );
+    if ( !sym )
+    {
+      continue;
+    }
+
     if ( !features.contains( sym ) )
     {
       features.insert( sym, QList<QgsFeature>() );
@@ -844,7 +849,7 @@ void QgsVectorLayer::drawRendererV2Levels( QgsRenderContext& rendererContext, bo
       mCachedGeometries[fet.id()] = *fet.geometry();
     }
 
-    if ( mRendererV2->symbolForFeature( fet ) != NULL )
+    if ( sym )
     {
       if ( labeling )
       {

Original file line number	Diff line number	Diff line change
`@@ -832,6 +832,11 @@ void QgsVectorLayer::drawRendererV2Levels( QgsRenderContext& rendererContext, bo`
`832`	`832`	`}`
`833`	`833`	`#endif //Q_WS_MAC`
`834`	`834`	`QgsSymbolV2* sym = mRendererV2->symbolForFeature( fet );`
	`835`	`+ if ( !sym )`
	`836`	`+ {`
	`837`	`+ continue;`
	`838`	`+ }`
	`839`	`+`
`835`	`840`	`if ( !features.contains( sym ) )`
`836`	`841`	`{`
`837`	`842`	`features.insert( sym, QList<QgsFeature>() );`
`@@ -844,7 +849,7 @@ void QgsVectorLayer::drawRendererV2Levels( QgsRenderContext& rendererContext, bo`
`844`	`849`	`mCachedGeometries[fet.id()] = *fet.geometry();`
`845`	`850`	`}`
`846`	`851`
`847`		`- if ( mRendererV2->symbolForFeature( fet ) != NULL )`
	`852`	`+ if ( sym )`
`848`	`853`	`{`
`849`	`854`	`if ( labeling )`
`850`	`855`	`{`