[Bf-blender-cvs] [fc59febb1b3] master: UI/Animation: Don't change Graph Editor cursor from scrubbing region

[Julian Eisel]

Commit: fc59febb1b30f390e733e1c775b93d128dd84e34
Author: Julian Eisel
Date:   Tue May 12 19:32:52 2020 +0200
Branches: master
https://developer.blender.org/rBfc59febb1b30f390e733e1c775b93d128dd84e34

UI/Animation: Don't change Graph Editor cursor from scrubbing region

Do not execute the operator to change the Graph Editor cursor when changing the
active frame through the scrubbing region. This is not what users expect, see
T76599.

Removes an explicit exception to not let the regular frame change operator
execute in the Graph Editor. It was needed to let the cursor operator run
instead, but the interplay between the two operators is now handled at keymap
level.

Fixes T76599.

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

M	release/scripts/addons
M	release/scripts/presets/keyconfig/keymap_data/blender_default.py
M	source/blender/editors/animation/anim_ops.c

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

diff --git a/release/scripts/addons b/release/scripts/addons
index 136030c9565..44c17b01168 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 136030c95656db371add0c5b7878f6442b8f24eb
+Subproject commit 44c17b01168ea180d7ea865e9ec1ef6e93097b3a
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index b9d84c55ac4..614a76c3994 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -1391,7 +1391,6 @@ def km_time_scrub(_params):
 
     items.extend([
         ("anim.change_frame", {"type": "LEFTMOUSE", "value": 'PRESS'}, None),
-        ("graph.cursor_set", {"type": "LEFTMOUSE", "value": 'PRESS'}, None),
     ])
 
     return keymap
diff --git a/source/blender/editors/animation/anim_ops.c b/source/blender/editors/animation/anim_ops.c
index 2db381dfc69..40cd368e02b 100644
--- a/source/blender/editors/animation/anim_ops.c
+++ b/source/blender/editors/animation/anim_ops.c
@@ -73,15 +73,9 @@ static bool change_frame_poll(bContext *C)
    * this shouldn't show up in 3D editor (or others without 2D timeline view) via search
    */
   if (area) {
-    if (ELEM(area->spacetype, SPACE_ACTION, SPACE_NLA, SPACE_SEQ, SPACE_CLIP)) {
+    if (ELEM(area->spacetype, SPACE_ACTION, SPACE_NLA, SPACE_SEQ, SPACE_CLIP, SPACE_GRAPH)) {
       return true;
     }
-    else if (area->spacetype == SPACE_GRAPH) {
-      /* NOTE: Graph Editor has special version which does some extra stuff.
-       * No need to show the generic error message for that case though!
-       */
-      return false;
-    }
   }
 
   CTX_wm_operator_poll_msg_set(C, "Expected an animation area to be active");