Fetch geometries when required by expression filter

Fix #16358
qgis · Mar 16, 2017 · 90e9144 · 90e9144
1 parent a7f92bd
commit 90e9144
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/core/qgsvectorlayerfeatureiterator.cpp b/src/core/qgsvectorlayerfeatureiterator.cpp
@@ -112,6 +112,11 @@ QgsVectorLayerFeatureIterator::QgsVectorLayerFeatureIterator( QgsVectorLayerFeat
           mRequest.setSubsetOfAttributes( mRequest.subsetOfAttributes() << attrIdx );
       }
     }
+
+    // Required for local filtering
+    // Also requred with compiler enabled for updateAttributeValues() on fetched features.
+    if ( mRequest.filterExpression()->needsGeometry() )
+      mRequest.setFlags( mRequest.flags() & ~QgsFeatureRequest::NoGeometry );
   }
 
   prepareFields();