Fix unnecessary calculations performed when a layer is set not to be …

…an obstacle for other labels (cherry picked from commit fc79502)
qgis · Aug 6, 2019 · d07e709 · d07e709
1 parent 090fa24
commit d07e709
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/core/pal/layer.cpp b/src/core/pal/layer.cpp
@@ -200,7 +200,7 @@ bool Layer::registerFeature( QgsLabelFeature *lf )
     addedFeature = true;
   }
 
-  if ( !featureGeomIsObstacleGeom )
+  if ( lf->isObstacle() && !featureGeomIsObstacleGeom )
   {
     //do the same for the obstacle geometry
     simpleGeometries.reset( Util::unmulti( lf->obstacleGeometry() ) );

diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -1715,7 +1715,7 @@ void QgsPalLayerSettings::registerFeature( const QgsFeature &f, QgsRenderContext
   }
 
   geos::unique_ptr geosObstacleGeomClone;
-  if ( !obstacleGeometry.isNull() )
+  if ( isObstacle && !obstacleGeometry.isNull() )
   {
     geosObstacleGeomClone = QgsGeos::asGeos( obstacleGeometry );
   }