[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56894] trunk/blender/source/blender/ editors: Fix #35390: sequencer end frame of preview range was not drawing correct.

[Brecht Van Lommel]

Revision: 56894
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56894
Author:   blendix
Date:     2013-05-18 10:24:38 +0000 (Sat, 18 May 2013)
Log Message:
-----------
Fix #35390: sequencer end frame of preview range was not drawing correct.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/animation/anim_draw.c
    trunk/blender/source/blender/editors/include/ED_anim_api.h
    trunk/blender/source/blender/editors/space_action/space_action.c
    trunk/blender/source/blender/editors/space_graph/space_graph.c
    trunk/blender/source/blender/editors/space_nla/space_nla.c
    trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c

Modified: trunk/blender/source/blender/editors/animation/anim_draw.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_draw.c	2013-05-18 10:24:34 UTC (rev 56893)
+++ trunk/blender/source/blender/editors/animation/anim_draw.c	2013-05-18 10:24:38 UTC (rev 56894)
@@ -251,7 +251,7 @@
 /* Note: 'Preview Range' tools are defined in anim_ops.c */
 
 /* Draw preview range 'curtains' for highlighting where the animation data is */
-void ANIM_draw_previewrange(const bContext *C, View2D *v2d)
+void ANIM_draw_previewrange(const bContext *C, View2D *v2d, int end_frame_width)
 {
 	Scene *scene = CTX_data_scene(C);
 	
@@ -262,9 +262,9 @@
 		glColor4f(0.0f, 0.0f, 0.0f, 0.4f);
 		
 		/* only draw two separate 'curtains' if there's no overlap between them */
-		if (PSFRA < PEFRA) {
+		if (PSFRA < PEFRA+end_frame_width) {
 			glRectf(v2d->cur.xmin, v2d->cur.ymin, (float)PSFRA, v2d->cur.ymax);
-			glRectf((float)PEFRA, v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
+			glRectf((float)(PEFRA+end_frame_width), v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
 		}
 		else {
 			glRectf(v2d->cur.xmin, v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);

Modified: trunk/blender/source/blender/editors/include/ED_anim_api.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_anim_api.h	2013-05-18 10:24:34 UTC (rev 56893)
+++ trunk/blender/source/blender/editors/include/ED_anim_api.h	2013-05-18 10:24:38 UTC (rev 56894)
@@ -491,7 +491,7 @@
 /* ------------- Preview Range Drawing -------------- */
 
 /* main call to draw preview range curtains */
-void ANIM_draw_previewrange(const struct bContext *C, struct View2D *v2d);
+void ANIM_draw_previewrange(const struct bContext *C, struct View2D *v2d, int end_frame_width);
 
 /* ************************************************* */
 /* F-MODIFIER TOOLS */

Modified: trunk/blender/source/blender/editors/space_action/space_action.c
===================================================================
--- trunk/blender/source/blender/editors/space_action/space_action.c	2013-05-18 10:24:34 UTC (rev 56893)
+++ trunk/blender/source/blender/editors/space_action/space_action.c	2013-05-18 10:24:38 UTC (rev 56894)
@@ -204,7 +204,7 @@
 	
 	/* preview range */
 	UI_view2d_view_ortho(v2d);
-	ANIM_draw_previewrange(C, v2d);
+	ANIM_draw_previewrange(C, v2d, 0);
 
 	/* callback */
 	UI_view2d_view_ortho(v2d);

Modified: trunk/blender/source/blender/editors/space_graph/space_graph.c
===================================================================
--- trunk/blender/source/blender/editors/space_graph/space_graph.c	2013-05-18 10:24:34 UTC (rev 56893)
+++ trunk/blender/source/blender/editors/space_graph/space_graph.c	2013-05-18 10:24:38 UTC (rev 56894)
@@ -294,7 +294,7 @@
 	
 	/* preview range */
 	UI_view2d_view_ortho(v2d);
-	ANIM_draw_previewrange(C, v2d);
+	ANIM_draw_previewrange(C, v2d, 0);
 	
 	/* callback */
 	UI_view2d_view_ortho(v2d);

Modified: trunk/blender/source/blender/editors/space_nla/space_nla.c
===================================================================
--- trunk/blender/source/blender/editors/space_nla/space_nla.c	2013-05-18 10:24:34 UTC (rev 56893)
+++ trunk/blender/source/blender/editors/space_nla/space_nla.c	2013-05-18 10:24:38 UTC (rev 56894)
@@ -310,7 +310,7 @@
 	
 	/* preview range */
 	UI_view2d_view_ortho(v2d);
-	ANIM_draw_previewrange(C, v2d);
+	ANIM_draw_previewrange(C, v2d, 0);
 	
 	/* callback */
 	UI_view2d_view_ortho(v2d);

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c	2013-05-18 10:24:34 UTC (rev 56893)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c	2013-05-18 10:24:38 UTC (rev 56894)
@@ -1457,7 +1457,7 @@
 	
 	/* preview range */
 	UI_view2d_view_ortho(v2d);
-	ANIM_draw_previewrange(C, v2d);
+	ANIM_draw_previewrange(C, v2d, 1);
 
 	/* overlap playhead */
 	if (scene->ed && scene->ed->over_flag & SEQ_EDIT_OVERLAY_SHOW) {