== Action Editor - Column Select Tools ==

* 'On Selected Markers' and 'Between Selected Markers' now get a
correction for NLA action scaling .

* Bugfix for 'Between Selected Markers': now keyframes that occur
on and between the selected markers get selected.

* Bugfix for 'On Selected Markers': now it only considers selected
markers (it used to consider all markers)

1 files changed, 11 insertions, 4 deletions

diff --git a/source/blender/src/edittime.c b/source/blender/src/edittime.c
index d71bc81b143..0a000d65419 100644
--- a/source/blender/src/edittime.c
+++ b/source/blender/src/edittime.c
@@ -493,10 +493,15 @@ TimeMarker *find_nearest_marker(int clip_y)
 }
 
 /* Adds a marker to list of cfra elems */
-void add_marker_to_cfra_elem(ListBase *lb, TimeMarker *marker)
+void add_marker_to_cfra_elem(ListBase *lb, TimeMarker *marker, short only_sel)
 {
 	CfraElem *ce, *cen;
 	
+	/* should this one only be considered if it is selected? */
+	if ((only_sel) && ((marker->flag & SELECT)==0))
+		return;
+	
+	/* try to find a previous cfra elem */
 	ce= lb->first;
 	while(ce) {
 		
@@ -518,14 +523,16 @@ void add_marker_to_cfra_elem(ListBase *lb, TimeMarker *marker)
 	cen->sel= marker->flag;
 }
 
-/* This function makes a list of the selected markers
+/* This function makes a list of all the markers. The only_sel
+ * argument is used to specify whether only the selected markers
+ * are added.
  */
-void make_marker_cfra_list(ListBase *lb)
+void make_marker_cfra_list(ListBase *lb, short only_sel)
 {
 	TimeMarker *marker;
 	
 	for (marker= G.scene->markers.first; marker; marker= marker->next) {
-		add_marker_to_cfra_elem(lb, marker);
+		add_marker_to_cfra_elem(lb, marker, only_sel);
 	}
 }