snapping:

* skip index build if snapping is off * use feature request limit when creating the snapping index
qgis · Jan 24, 2016 · bbfcbca · bbfcbca
1 parent 8ad6ca0
commit bbfcbca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/core/qgspointlocator.cpp b/src/core/qgspointlocator.cpp
@@ -642,6 +642,7 @@ bool QgsPointLocator::rebuildIndex( int maxFeaturesToIndex )
 
   QgsFeatureRequest request;
   request.setSubsetOfAttributes( QgsAttributeList() );
+  request.setLimit( maxFeaturesToIndex );
   if ( mExtent )
   {
     QgsRectangle rect = *mExtent;

diff --git a/src/core/qgssnappingutils.cpp b/src/core/qgssnappingutils.cpp
@@ -214,7 +214,7 @@ QgsPointLocator::Match QgsSnappingUtils::snapToMap( const QgsPoint& pointMap, Qg
 
   if ( mSnapToMapMode == SnapCurrentLayer )
   {
-    if ( !mCurrentLayer )
+    if ( !mCurrentLayer || mDefaultType == 0 )
       return QgsPointLocator::Match();
 
     prepareIndex( QList<QgsVectorLayer*>() << mCurrentLayer );