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

Fix: Graph Editor Circle/Lasso select fails to select handles

Browse Source 
... if "Only Show Selected Keyframes Handles" is turned ON

The piece of code from fa24ad1fd5 -- and that copied from 233c650d55 --
which alters `incl_handles` for Circle/Lasso is outdated...

Atm. it would set `incl_handles` to `false` as soon as either "Show
Handles" is OFF or "Only Show Selected Keyframes Handles" is ON.
So bug-symptoms would be:
- turn ON both "Show Handles" and "Only Show Selected Keyframes Handles"
- select a single keyframe (so its handles are visible)
- try to select that handle using Circle/Lasso
- fail
- (alternatively: select the key using Circle/Lasso >> handles get
selected as well, also a fail)

In b037ba2665 though we introduced
`KEYFRAME_ITER_HANDLES_DEFAULT_INVISIBLE` in which can properly handle
such cases in `keyframe_ok_checks` / `select_bezier_add` /
`select_bezier_subtract`, so it makes sense to only check for "Show
Handles" Circle/Lasso and let `initialize_box_select_key_editing_data` /
`keyframe_ok_checks` / `select_bezier_add` / `select_bezier_subtract`
handle the rest...

Noticed while doing !139349, part of #139314

Pull Request: https://projects.blender.org/blender/blender/pulls/139531
This commit is contained in:
Philipp Oeser
2025-05-30 16:31:51 +02:00
committed by Philipp Oeser
parent af62f64d48
commit 7494a57b16
1 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -954,8 +954,6 @@ static wmOperatorStatus graphkeys_lassoselect_exec(bContext *C, wmOperator *op)
rcti rect;
rctf rect_fl;
bool incl_handles;
/* Get editor data. */
if (ANIM_animdata_get_context(C, &ac) == 0) {
return OPERATOR_CANCELLED;
@@ -973,21 +971,13 @@ static wmOperatorStatus graphkeys_lassoselect_exec(bContext *C, wmOperator *op)
deselect_graph_keys(&ac, false, SELECT_SUBTRACT, true);
}
{
SpaceGraph *sipo = (SpaceGraph *)ac.sl;
if (selectmode == SELECT_ADD) {
incl_handles = ((sipo->flag & SIPO_SELVHANDLESONLY) || (sipo->flag & SIPO_NOHANDLES)) == 0;
}
else {
incl_handles = (sipo->flag & SIPO_NOHANDLES) == 0;
}
}
/* Get settings from operator. */
BLI_lasso_boundbox(&rect, data_lasso.mcoords);
BLI_rctf_rcti_copy(&rect_fl, &rect);
/* Apply box_select action. */
SpaceGraph *sgraph = reinterpret_cast<SpaceGraph *>(ac.sl);
const bool incl_handles = (sgraph->flag & SIPO_NOHANDLES) == 0;
const bool any_key_selection_changed = box_select_graphkeys(
&ac, &rect_fl, BEZT_OK_REGION_LASSO, selectmode, incl_handles, &data_lasso);
const bool use_curve_selection = RNA_boolean_get(op->ptr, "use_curve_selection");
@@ -1036,7 +1026,6 @@ void GRAPH_OT_select_lasso(wmOperatorType *ot)
static wmOperatorStatus graph_circle_select_exec(bContext *C, wmOperator *op)
{
bAnimContext ac;
bool incl_handles = false;
KeyframeEdit_CircleData data = {nullptr};
rctf rect_fl;
@@ -1068,17 +1057,9 @@ static wmOperatorStatus graph_circle_select_exec(bContext *C, wmOperator *op)
rect_fl.ymin = y - radius;
rect_fl.ymax = y + radius;
{
SpaceGraph *sipo = (SpaceGraph *)ac.sl;
if (selectmode == SELECT_ADD) {
incl_handles = ((sipo->flag & SIPO_SELVHANDLESONLY) || (sipo->flag & SIPO_NOHANDLES)) == 0;
}
else {
incl_handles = (sipo->flag & SIPO_NOHANDLES) == 0;
}
}
/* Apply box_select action. */
SpaceGraph *sgraph = reinterpret_cast<SpaceGraph *>(ac.sl);
const bool incl_handles = (sgraph->flag & SIPO_NOHANDLES) == 0;
const bool any_key_selection_changed = box_select_graphkeys(
&ac, &rect_fl, BEZT_OK_REGION_CIRCLE, selectmode, incl_handles, &data);
if (any_key_selection_changed) {