diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2020-11-24 18:05:58 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2020-11-24 18:05:58 +0300 |
| commit | 256a9d983d4862560071393f7ddf44bcbd34ad74 (patch) | |
| tree | e59fb5ba5310b9550ce23bb8cdb7865192745a95 /source/blender/editors/space_graph | |
| parent | 278011e44d433dc202b2ab8e7907e323fb23c82d (diff) | |
| parent | 31bf8307afc0fb995afcf2233dc50c28b531778d (diff) | |
Merge remote-tracking branch 'origin/blender-v2.91-release'
Diffstat (limited to 'source/blender/editors/space_graph')
| -rw-r--r-- | source/blender/editors/space_graph/graph_select.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/editors/space_graph/graph_select.c b/source/blender/editors/space_graph/graph_select.c index ba684972dd7..13f2219d7af 100644 --- a/source/blender/editors/space_graph/graph_select.c +++ b/source/blender/editors/space_graph/graph_select.c @@ -1518,8 +1518,13 @@ static int mouse_graph_keys(bAnimContext *ac, something_was_selected = true; } - if (!run_modal && BEZT_ISSEL_ANY(bezt) && !already_selected) { - BKE_fcurve_active_keyframe_set(nvi->fcu, bezt); + if (!run_modal && BEZT_ISSEL_ANY(bezt)) { + const bool may_activate = !already_selected || + BKE_fcurve_active_keyframe_index(nvi->fcu) == + FCURVE_ACTIVE_KEYFRAME_NONE; + if (may_activate) { + BKE_fcurve_active_keyframe_set(nvi->fcu, bezt); + } } } else if (nvi->fpt) { |