[Bf-blender-cvs] [2cdcb1c] master: Revert "Fix off by one error in display of start/end frame in sequencer."

Antony Riakiotakis noreply at git.blender.org
Thu Jun 25 20:13:03 CEST 2015


Commit: 2cdcb1c1716180c00c23feb8332f17c2bab74864
Author: Antony Riakiotakis
Date:   Thu Jun 25 20:10:30 2015 +0200
Branches: master
https://developer.blender.org/rB2cdcb1c1716180c00c23feb8332f17c2bab74864

Revert "Fix off by one error in display of start/end frame in sequencer."

This reverts commit 0e02ad8b6495b2755598a24b487041a3ed8e0116.

Initial commit was done so visual result fits with animation cursor
in timeline but this makes it so it looks like one extra frame is
rendered. Other idea would be to render one less frame for sequencer
but this is not so nice either. Generally here's no way to be
fully consistent here, but at least let's be workflow-consistent

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

M	source/blender/editors/space_sequencer/sequencer_draw.c

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

diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 71bfb21..27eb28be 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -1521,7 +1521,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;
+	const int frame_end = PEFRA + 1;
 
 	glEnable(GL_BLEND);
 	
@@ -1529,7 +1529,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 + 1) {
+	if (frame_sta < frame_end) {
 		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);
 	}




More information about the Bf-blender-cvs mailing list