2.5 - Restored Various Tools using Markers

* Added back a few Marker-API tools
* Restored column select tools using markers (some of these aren't working right yet though).

3 files changed, 18 insertions, 4 deletions

diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h
index 0210e3d6a85..e0f322b79ff 100644
--- a/source/blender/editors/include/ED_anim_api.h
+++ b/source/blender/editors/include/ED_anim_api.h
@@ -64,6 +64,7 @@ typedef struct bAnimContext {
 	
 	struct Scene *scene;	/* active scene */
 	struct Object *obact;	/* active object */
+	ListBase markers;		/* active set of markers */
 } bAnimContext;
 
 /* Main Data container types */
diff --git a/source/blender/editors/include/ED_keyframes_edit.h b/source/blender/editors/include/ED_keyframes_edit.h
index 44d4e26fea5..77e95dc77de 100644
--- a/source/blender/editors/include/ED_keyframes_edit.h
+++ b/source/blender/editors/include/ED_keyframes_edit.h
@@ -137,6 +137,7 @@ BeztEditFunc ANIM_editkeyframes_ipo(short mode);
 /* ----------- BezTriple Callback (Assorted Utilities) ---------- */
 
 short bezt_calc_average(BeztEditData *bed, struct BezTriple *bezt);
+short bezt_to_cfraelem(BeztEditData *bed, struct BezTriple *bezt);
 
 /* ************************************************ */
 /* Destructive Editing API (keyframes_general.c) */
diff --git a/source/blender/editors/include/ED_markers.h b/source/blender/editors/include/ED_markers.h
index 0e9a82083a6..048bbbd7463 100644
--- a/source/blender/editors/include/ED_markers.h
+++ b/source/blender/editors/include/ED_markers.h
@@ -28,6 +28,11 @@
 #ifndef ED_MARKERS_H
 #define ED_MARKERS_H
 
+struct wmWindowManager;
+struct bContext;
+struct TimeMarker;
+
+/* Drawing API ------------------------------ */
 
 /* flags for drawing markers */
 enum {
@@ -35,11 +40,18 @@ enum {
 	DRAW_MARKERS_LOCAL	= (1<<1)
 };
 
-struct wmWindowManager;
-struct bContext;
-
 void draw_markers_time(const struct bContext *C, int flag);
-int find_nearest_marker_time(ListBase *markers, float dx);
+
+/* Backend API ----------------------------- */
+
+struct TimeMarker *ED_markers_find_nearest_marker(ListBase *markers, float x);
+int ED_markers_find_nearest_marker_time(ListBase *markers, float x);
+
+void ED_markers_get_minmax(ListBase *markers, short sel, float *first, float *last);
+
+void ED_markers_make_cfra_list(ListBase *markers, ListBase *lb, short sel);
+
+/* Operators ------------------------------ */
 
 /* called in screen_ops.c:ED_operatortypes_screen() */
 void ED_marker_operatortypes(void);