[Bf-blender-cvs] [e18fdef39fe] active-fcurve-keyframe: Deselect before set active on shift click

[Hans Goudey]

Commit: e18fdef39febd62d2db791ac2a9e409788b2a862
Author: Hans Goudey
Date:   Fri Jul 10 09:35:39 2020 -0400
Branches: active-fcurve-keyframe
https://developer.blender.org/rBe18fdef39febd62d2db791ac2a9e409788b2a862

Deselect before set active on shift click

===================================================================

M	source/blender/editors/space_graph/graph_select.c

===================================================================

diff --git a/source/blender/editors/space_graph/graph_select.c b/source/blender/editors/space_graph/graph_select.c
index ef2c4e9df82..c0ee5504342 100644
--- a/source/blender/editors/space_graph/graph_select.c
+++ b/source/blender/editors/space_graph/graph_select.c
@@ -1487,7 +1487,7 @@ static int mouse_graph_keys(bAnimContext *ac,
       bezt = nvi->bezt; /* Used to check `bezt` selection is set. */
       /* Only deselect keyframe if it's already active, so that shift-click activates
        * a keyframe before selecting it. */
-      if (select_mode == SELECT_INVERT && (&nvi->fcu->bezt[nvi->fcu->active_key] == bezt)) {
+      if (select_mode == SELECT_INVERT) {
         if (nvi->hpoint == NEAREST_HANDLE_KEY) {
           bezt->f2 ^= SELECT;
         }
@@ -1513,7 +1513,7 @@ static int mouse_graph_keys(bAnimContext *ac,
       }
 
       /* Set the curve's active keyframe. */
-      if (!run_modal && BEZT_ISSEL_ANY(bezt)) {
+      if (!run_modal && BEZT_ISSEL_ANY(bezt) && !already_selected) {
         nvi->fcu->active_key = bezt - nvi->fcu->bezt;
       }
     }