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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2017-10-24 03:04:58 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2017-10-24 03:05:41 +0300
commitf5456df095291c6cb2d0223a179746c8e514cd15 (patch)
tree76384b0c91806c95d55b007850ee225889a3250e /source/blender/editors/space_sequencer
parent254daf8f8c276a4e5292e5a12fcfa88296131878 (diff)
parent070a668d04844610059aaedc80c49e9038fd1779 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_sequencer')
-rw-r--r--source/blender/editors/space_sequencer/sequencer_draw.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index c14e427b133..01b7c8793ba 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -1688,9 +1688,8 @@ void draw_timeline_seq(const bContext *C, ARegion *ar)
/* draw backdrop */
draw_seq_backdrop(v2d);
- /* regular grid-pattern over the rest of the view (i.e. 25-frame grid lines) */
- // NOTE: the gridlines are currently spaced every 25 frames, which is only fine for 25 fps, but maybe not for 30...
- UI_view2d_constant_grid_draw(v2d);
+ /* regular grid-pattern over the rest of the view (i.e. 1-second grid lines) */
+ UI_view2d_constant_grid_draw(v2d, FPS);
/* Only draw backdrop in pure sequence view. */
if (sseq->view == SEQ_VIEW_SEQUENCE && sseq->draw_flag & SEQ_DRAW_BACKDROP) {