diff grid.mm @ 45:c2fffc8ea84d

10 timbre params.

--- a/grid.mm	Mon Apr 22 18:32:34 2013 +0100
+++ b/grid.mm	Tue Apr 23 18:29:55 2013 +0100
@@ -535,17 +535,19 @@
 //--------------------------------------------------------------
 void Grid::snapCheck(){
     lEvent *closestEvalPt;
-    if(interpolateMode == INTERPOLATE_GRID){
-        snapped = false;
-        closestPreset = NULL;
-        snapCentre = centre;
-        return;
-    } // no presets visible
+
     
     // check environs for presets.
     
     vector<Preset *> closePresets = presetManager.getPresetsInRange(centre - snapDist*scale, centre + snapDist*scale);
     if(closePresets.size() > 0){
+        if(interpolateMode == INTERPOLATE_GRID){
+            snapped = false;
+            closestPreset = NULL;
+            snapCentre = centre;
+            return;
+        } // no presets visible
+        
         snapped = true;
         presetWasTapped = false;
         closestPreset = getClosestPresetOf(closePresets);
@@ -554,6 +556,7 @@
 
        
     }else{
+        // look for evaluation points
         // do an evaluation snap check . duplicate code >:[
 
         vector<lEvent *> closeEvalPoints = eventLogger.getEvaluationPointsInRange(centre - snapDist*scale, centre + snapDist*scale);