[Bf-blender-cvs] [8df339438a0] master: Fix T72682: Regression when moving markers while holding ctrl

[Jacques Lucke]

Commit: 8df339438a051ffb31384fa700900c50d63f9275
Author: Jacques Lucke
Date:   Sun Jan 5 15:55:54 2020 +0100
Branches: master
https://developer.blender.org/rB8df339438a051ffb31384fa700900c50d63f9275

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

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

M	source/blender/editors/animation/anim_markers.c

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

diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c
index 13358808a23..e0d72ab5198 100644
--- a/source/blender/editors/animation/anim_markers.c
+++ b/source/blender/editors/animation/anim_markers.c
@@ -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);