First merge with 2.5 branch.
authorArystanbek Dyussenov <arystan.d@gmail.com>
Fri, 8 May 2009 16:02:58 +0000 (16:02 +0000)
committerArystanbek Dyussenov <arystan.d@gmail.com>
Fri, 8 May 2009 16:02:58 +0000 (16:02 +0000)
1  2 
source/blender/editors/animation/anim_filter.c
source/blender/editors/animation/anim_markers.c
source/blender/editors/animation/keyframes_edit.c
source/blender/editors/space_action/action_edit.c
source/blender/editors/space_graph/graph_edit.c
source/gameengine/BlenderRoutines/CMakeLists.txt
source/gameengine/BlenderRoutines/SConscript

index 58e3aa8e172a4bed06695413dd89f962727e9b24,3848eef360842bb6aba7f620b15f84f6146d9534..97904dcdddfceba8f031f6b1d9addecfc09bb180
@@@ -586,24 -731,6 +598,24 @@@ static void select_timeline_marker_fram
        }
  }
  
- int find_nearest_marker_time(ListBase *markers, float dx)
++int find_nearest_marker_time (ListBase *markers, float dx)
 +{
 +      TimeMarker *marker, *nearest= NULL;
 +      float dist, min_dist= 1000000;
 +      
-       for(marker= markers->first; marker; marker= marker->next) {
++      for (marker= markers->first; marker; marker= marker->next) {
 +              dist = ABS((float)marker->frame - dx);
-               if(dist < min_dist){
++              if (dist < min_dist) {
 +                      min_dist= dist;
 +                      nearest= marker;
 +              }
 +      }
 +      
-       if(nearest) return nearest->frame;
++      if (nearest) return nearest->frame;
 +      else return (int)floor(dx); /* hrmf? */
 +}
 +
 +
  static int ed_marker_select(bContext *C, wmEvent *evt, int extend)
  {
        ListBase *markers= context_get_markers(C);