blender
/
blender
128
396
Fork 568
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Fix T72682: Regression when moving markers while holding ctrl 

In 2.79 when moving a marker with `G` while holding `ctrl` the marker
would snap to one-second movements. This was (probably accidentally)
removed when the Timeline Editor was removed in rB5374865523faf253.

Reviewers: mano-wii

Differential Revision: https://developer.blender.org/D6527
This commit is contained in:
Jacques Lucke 2020-01-05 15:55:54 +01:00
parent 485ff4b9bf
commit 8df339438a
Notes: blender-bot 2023-09-08 04:55:43 +02:00 
Referenced by issue #72682, Moving Animation Markers no longer allows snapping
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1001,13 +1001,7 @@ static int ed_marker_move_modal(bContext *C, wmOperator *op, const wmEvent *even
mm->evtx = event->x;
fac = ((float)(event->x - mm->firstx) * dx);
apply_keyb_grid(event->shift,
event->ctrl,
&fac,
0.0,
1.0,
0.1,
0 /*was: U.flag & USER_AUTOGRABGRID*/);
apply_keyb_grid(event->shift, event->ctrl, &fac, 0.0, FPS, 0.1 * FPS, 0);
RNA_int_set(op->ptr, "frames", (int)fac);
ed_marker_move_apply(C, op);