Merge branch 'master' of github.com:qgis/Quantum-GIS

timlinux · timlinux · commit 6509df23f41a · 2011-06-28T11:11:18.000+02:00
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -518,7 +518,7 @@ bool QgsOgrProvider::nextFeature( QgsFeature& feature )
   OGRFeatureH fet;
   QgsRectangle selectionRect;
 
-  setRelevantFields( mFetchGeom, mAttributesToFetch );
+  setRelevantFields( mFetchGeom || mUseIntersect, mAttributesToFetch );
 
   while (( fet = OGR_L_GetNextFeature( ogrLayer ) ) )
   {

Original file line number	Diff line number	Diff line change
`@@ -518,7 +518,7 @@ bool QgsOgrProvider::nextFeature( QgsFeature& feature )`
`518`	`518`	`OGRFeatureH fet;`
`519`	`519`	`QgsRectangle selectionRect;`
`520`	`520`
`521`		`- setRelevantFields( mFetchGeom, mAttributesToFetch );`
	`521`	`+ setRelevantFields( mFetchGeom \|\| mUseIntersect, mAttributesToFetch );`
`522`	`522`
`523`	`523`	`while (( fet = OGR_L_GetNextFeature( ogrLayer ) ) )`
`524`	`524`	`{`