blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 777 Projects 19 Wiki Activity

Fix #95855: Selection of overlapping keys with active FCurve #107445

Closed
Christoph Lendenfeld wants to merge 1 commits from ChrisLend/blender:fix_keyframe_selection into main
pull from: ChrisLend/blender:fix_keyframe_selection
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 2 Commits 1 Files Changed 1 +37 -18
1 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
source/blender/editors/space_graph/graph_select.c
View File

@ -259,9 +259,6 @@ static void get_nearest_fcurve_verts_list(bAnimContext *ac, const int mval[2], L
/* helper for find_nearest_fcurve_vert() - get the best match to use */ /* helper for find_nearest_fcurve_vert() - get the best match to use */
static tNearestVertInfo *get_best_nearest_fcurve_vert(ListBase *matches) static tNearestVertInfo *get_best_nearest_fcurve_vert(ListBase *matches)
{ {
tNearestVertInfo *nvi = NULL;
short found = 0;
/* abort if list is empty */ /* abort if list is empty */
if (BLI_listbase_is_empty(matches)) { if (BLI_listbase_is_empty(matches)) {
return NULL; return NULL;
@ -273,28 +270,50 @@ static tNearestVertInfo *get_best_nearest_fcurve_vert(ListBase *matches)
return BLI_pophead(matches); return BLI_pophead(matches);
} }
/* try to find the first selected F-Curve vert, then take the one after it */ tNearestVertInfo *nvi = NULL;
tNearestVertInfo *best = NULL;
bool after_active_fcu = false;
/* List of priority: active fcu > after active fcu > Selected fcu > unselected fcu. The "after
* active fcu" enables cycling through keys by clicking on them repeatedly. */
for (nvi = matches->first; nvi; nvi = nvi->next) { for (nvi = matches->first; nvi; nvi = nvi->next) {
/* which mode of search are we in: find first selected, or find vert? */ if (nvi->fcu->flag & FCURVE_ACTIVE) {
if (found) { after_active_fcu = true;
/* Just take this vert now that we've found the selected one
* - We'll need to remove this from the list
* so that it can be returned to the original caller.
*/
BLI_remlink(matches, nvi);
return nvi;
} }
/* if vert is selected, we've got what we want... */
if (nvi->sel) { if (nvi->sel) {
found = 1; continue;
}
if (nvi->fcu->flag & FCURVE_ACTIVE) {
/* Exit early because there can only be 1 active FCurve and it has the highest selection
* priority. */
best = nvi;
break;
}
if (after_active_fcu) {
best = nvi;
after_active_fcu = false;
}
if (best == NULL) {
best = nvi;
continue;
}
if ((nvi->fcu->flag & FCURVE_SELECTED) && !(best->fcu->flag & FCURVE_SELECTED)) {
best = nvi;
} }
} }
/* if we're still here, this means that we failed to find anything appropriate in the first pass, if (best != NULL) {
* so just take the first item now... BLI_remlink(matches, best);
*/ return best;
return BLI_pophead(matches); }
else {
/* Can happen if all verts are selected. */
return BLI_pophead(matches);
}
} }
/** /**