griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: clarify ED_markers_make_cfra_list only selected argument

Browse Source 
The argument read as if it might be a flag (callers passed in SELECT),
but it was in fact used as a boolean.
This commit is contained in:
Campbell Barton
2024-07-27 13:30:57 +10:00
parent 80f135e7d2
commit e974ee05dc
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/animation/anim_markers.cc
View File

@@ -257,12 +257,12 @@ static bool region_position_is_over_marker(View2D *v2d, ListBase *markers, float
/* --------------------------------- */
/* Adds a marker to list of cfra elems */
static void add_marker_to_cfra_elem(ListBase *lb, TimeMarker *marker, short only_sel)
static void add_marker_to_cfra_elem(ListBase *lb, TimeMarker *marker, const bool only_selected)
{
CfraElem *ce, *cen;
/* should this one only be considered if it is selected? */
if ((only_sel) && ((marker->flag & SELECT) == 0)) {
if (only_selected && ((marker->flag & SELECT) == 0)) {
return;
}
@@ -292,7 +292,7 @@ static void add_marker_to_cfra_elem(ListBase *lb, TimeMarker *marker, short only
cen->sel = marker->flag;
}
void ED_markers_make_cfra_list(ListBase *markers, ListBase *lb, short only_sel)
void ED_markers_make_cfra_list(ListBase *markers, ListBase *lb, const bool only_selected)
{
if (lb) {
/* Clear the list first, since callers have no way of knowing
@@ -310,7 +310,7 @@ void ED_markers_make_cfra_list(ListBase *markers, ListBase *lb, short only_sel)
}
LISTBASE_FOREACH (TimeMarker *, marker, markers) {
add_marker_to_cfra_elem(lb, marker, only_sel);
add_marker_to_cfra_elem(lb, marker, only_selected);
}
}

2
source/blender/editors/armature/pose_slide.cc
View File

@@ -1765,7 +1765,7 @@ static float find_last_key(ListBase *pflinks)
static void get_selected_marker_positions(Scene *scene, ListBase /*FrameLink*/ *target_frames)
{
ListBase selected_markers = {nullptr, nullptr};
ED_markers_make_cfra_list(&scene->markers, &selected_markers, SELECT);
ED_markers_make_cfra_list(&scene->markers, &selected_markers, true);
LISTBASE_FOREACH (CfraElem *, marker, &selected_markers) {
FrameLink *link = static_cast<FrameLink *>(MEM_callocN(sizeof(FrameLink), "Marker Key Link"));
link->frame = marker->cfra;

2
source/blender/editors/include/ED_markers.hh
View File

@@ -74,7 +74,7 @@ void ED_markers_get_minmax(ListBase *markers, short sel, float *r_first, float *
* argument is used to specify whether only the selected markers
* are added.
*/
void ED_markers_make_cfra_list(ListBase *markers, ListBase *lb, short only_sel);
void ED_markers_make_cfra_list(ListBase *markers, ListBase *lb, bool only_selected);
void ED_markers_deselect_all(ListBase *markers, int action);

2
source/blender/editors/space_action/action_select.cc
View File

@@ -1200,7 +1200,7 @@ static void columnselect_action_keys(bAnimContext *ac, short mode)
break;
case ACTKEYS_COLUMNSEL_MARKERS_COLUMN: /* list of selected markers */
ED_markers_make_cfra_list(ac->markers, &ked.list, SELECT);
ED_markers_make_cfra_list(ac->markers, &ked.list, true);
break;
default: /* invalid option */

2
source/blender/editors/space_graph/graph_select.cc
View File

@@ -1252,7 +1252,7 @@ static void columnselect_graph_keys(bAnimContext *ac, short mode)
break;
case GRAPHKEYS_COLUMNSEL_MARKERS_COLUMN: /* list of selected markers */
ED_markers_make_cfra_list(ac->markers, &ked.list, SELECT);
ED_markers_make_cfra_list(ac->markers, &ked.list, true);
break;
default: /* invalid option */