Revert a modification in diagram provider

pblottiere · pblottiere · commit 51a52293aef9 · 2017-10-09T05:13:59.000+01:00
diff --git a/src/core/qgsvectorlayerdiagramprovider.cpp b/src/core/qgsvectorlayerdiagramprovider.cpp
@@ -192,7 +192,7 @@ QgsLabelFeature *QgsVectorLayerDiagramProvider::registerDiagram( QgsFeature &fea
   }
 
   // data defined show diagram? check this before doing any other processing
-  if ( !mSettings.dataDefinedProperties().valueAsBool( QgsDiagramLayerSettings::Show, context.expressionContext(), true ) || !context.expressionContext().feature().isValid() )
+  if ( !mSettings.dataDefinedProperties().valueAsBool( QgsDiagramLayerSettings::Show, context.expressionContext(), true ) )
     return nullptr;
 
   // data defined obstacle?

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ QgsLabelFeature *QgsVectorLayerDiagramProvider::registerDiagram( QgsFeature &fea`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`// data defined show diagram? check this before doing any other processing`
`195`		`- if ( !mSettings.dataDefinedProperties().valueAsBool( QgsDiagramLayerSettings::Show, context.expressionContext(), true ) \|\| !context.expressionContext().feature().isValid() )`
	`195`	`+ if ( !mSettings.dataDefinedProperties().valueAsBool( QgsDiagramLayerSettings::Show, context.expressionContext(), true ) )`
`196`	`196`	`return nullptr;`
`197`	`197`
`198`	`198`	`// data defined obstacle?`