blender
/
blender
134
399
Fork 582
Code Issues 6.3k Pull Requests 755 Projects 19 Wiki Activity

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.
This commit is contained in:
Julian Eisel 2020-05-12 19:32:52 +02:00
parent 94b9141c95
commit fc59febb1b
Notes: blender-bot 2023-02-14 02:22:13 +01:00 
Referenced by issue #76599, 2D cursor moves unintendedly when changing frames in Graph editor
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/addons

@ -1 +1 @@
Subproject commit 136030c95656db371add0c5b7878f6442b8f24eb
Subproject commit 44c17b01168ea180d7ea865e9ec1ef6e93097b3a

1
release/scripts/presets/keyconfig/keymap_data/blender_default.py
View File

@ -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

8
source/blender/editors/animation/anim_ops.c
View File

@ -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");