Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Eisel <julian@blender.org>2020-05-12 20:32:52 +0300
committerJulian Eisel <julian@blender.org>2020-05-12 20:40:41 +0300
commitfc59febb1b30f390e733e1c775b93d128dd84e34 (patch)
treeae67a79f9d2abf26472d5cab577179a06f5c3f81
parent94b9141c953bb4c276631bd40145f81f07304c9c (diff)
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/addons0
-rw-r--r--release/scripts/presets/keyconfig/keymap_data/blender_default.py1
-rw-r--r--source/blender/editors/animation/anim_ops.c8
3 files changed, 1 insertions, 8 deletions
diff --git a/release/scripts/addons b/release/scripts/addons
-Subproject 136030c95656db371add0c5b7878f6442b8f24e
+Subproject 44c17b01168ea180d7ea865e9ec1ef6e93097b3
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");