[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30204] trunk/blender/source: - sequencer wasnt drawing handles, the deprecated v2d was being used which gave a pixely of -nan.

Campbell Barton ideasman42 at gmail.com
Sun Jul 11 14:39:50 CEST 2010


Revision: 30204
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30204
Author:   campbellbarton
Date:     2010-07-11 14:39:50 +0200 (Sun, 11 Jul 2010)

Log Message:
-----------
- sequencer wasnt drawing handles, the deprecated v2d was being used which gave a pixely of -nan.
- removed bf_editors from cmake since there now split up.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
    trunk/blender/source/creator/CMakeLists.txt

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c	2010-07-11 12:25:54 UTC (rev 30203)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c	2010-07-11 12:39:50 UTC (rev 30204)
@@ -365,14 +365,13 @@
 	}	
 }
 
-static void draw_seq_extensions(Scene *scene, SpaceSeq *sseq, Sequence *seq)
+static void draw_seq_extensions(Scene *scene, ARegion *ar, SpaceSeq *sseq, Sequence *seq)
 {
 	float x1, x2, y1, y2, pixely, a;
 	char col[3], blendcol[3];
-	View2D *v2d= &sseq->v2d;
+	View2D *v2d= &ar->v2d;
 	
 	if(seq->type >= SEQ_EFFECT) return;
-	if(v2d->mask.ymax == v2d->mask.ymin) return; /* avoid divide by zero */
 
 	x1= seq->startdisp;
 	x2= seq->enddisp;
@@ -625,7 +624,7 @@
 	
 	/* draw additional info and controls */
 	if (!is_single_image)
-		draw_seq_extensions(scene, sseq, seq);
+		draw_seq_extensions(scene, ar, sseq, seq);
 	
 	draw_seq_handle(v2d, seq, pixelx, SEQ_LEFTHANDLE);
 	draw_seq_handle(v2d, seq, pixelx, SEQ_RIGHTHANDLE);

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2010-07-11 12:25:54 UTC (rev 30203)
+++ trunk/blender/source/creator/CMakeLists.txt	2010-07-11 12:39:50 UTC (rev 30204)
@@ -425,7 +425,6 @@
 		blender_CTR 
 		bf_moto 
 		bf_windowmanager
-		bf_editors
 		bf_blroutines 
 		bf_converter 
 		bf_dummy 





More information about the Bf-blender-cvs mailing list