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:
authorAntony Riakiotakis <kalast@gmail.com>2015-05-27 15:44:40 +0300
committerAntony Riakiotakis <kalast@gmail.com>2015-05-27 15:44:40 +0300
commit62fd4395ac594dd02a61982d2bf92839d9810f1b (patch)
tree0d96caf8481265bbe6b376961d00f58dbc46845e /source/blender/editors/space_sequencer/sequencer_draw.c
parent322380999ed91179ebce511c7b14e470b48bf993 (diff)
parentb52af946cd92993dd6918797214d956070813878 (diff)
Merge branch 'master' into gooseberry
Diffstat (limited to 'source/blender/editors/space_sequencer/sequencer_draw.c')
-rw-r--r--source/blender/editors/space_sequencer/sequencer_draw.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 290f05a6483..7d4afffe73f 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -1549,7 +1549,7 @@ static void seq_draw_sfra_efra(Scene *scene, View2D *v2d)
{
const Editing *ed = BKE_sequencer_editing_get(scene, false);
const int frame_sta = PSFRA;
- const int frame_end = PEFRA + 1;
+ const int frame_end = PEFRA;
glEnable(GL_BLEND);
@@ -1557,7 +1557,7 @@ static void seq_draw_sfra_efra(Scene *scene, View2D *v2d)
* frame range used is preview range or scene range */
UI_ThemeColorShadeAlpha(TH_BACK, -25, -100);
- if (frame_sta < frame_end) {
+ if (frame_sta < frame_end + 1) {
glRectf(v2d->cur.xmin, v2d->cur.ymin, (float)frame_sta, v2d->cur.ymax);
glRectf((float)frame_end, v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
}