[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12331] trunk/blender/source/blender: == Sequencer ==

Peter Schlaile peter at schlaile.de
Sun Oct 21 22:05:02 CEST 2007


Revision: 12331
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12331
Author:   schlaile
Date:     2007-10-21 22:05:01 +0200 (Sun, 21 Oct 2007)

Log Message:
-----------
== Sequencer ==

Peach request: display last mapped frame in status bar of speed control
effect. (To come: auto-resize based on this information)

Modified Paths:
--------------
    trunk/blender/source/blender/makesdna/DNA_sequence_types.h
    trunk/blender/source/blender/src/drawseq.c
    trunk/blender/source/blender/src/seqeffects.c

Modified: trunk/blender/source/blender/makesdna/DNA_sequence_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_sequence_types.h	2007-10-21 19:19:53 UTC (rev 12330)
+++ trunk/blender/source/blender/makesdna/DNA_sequence_types.h	2007-10-21 20:05:01 UTC (rev 12331)
@@ -185,7 +185,7 @@
 	float globalSpeed;
 	int flags;
 	int length;
-	int pad;
+	int lastValidFrame;
 } SpeedControlVars;
 
 /* SpeedControlVars->flags */

Modified: trunk/blender/source/blender/src/drawseq.c
===================================================================
--- trunk/blender/source/blender/src/drawseq.c	2007-10-21 19:19:53 UTC (rev 12330)
+++ trunk/blender/source/blender/src/drawseq.c	2007-10-21 20:05:01 UTC (rev 12331)
@@ -987,6 +987,20 @@
 		glRasterPos3f(xco,  yco, 0.0);
 		BMF_DrawString(G.font, str);
 	}
+	else if(last_seq->type == SEQ_SPEED) {
+		SpeedControlVars * vars = 
+			(SpeedControlVars*) last_seq->effectdata;
+
+		if (vars) {
+			sprintf(str, "Last mapped frame: %d at %d", 
+				vars->lastValidFrame, 
+				vars->lastValidFrame 
+				+ last_seq->startdisp);
+
+			glRasterPos3f(xco,  yco, 0.0);
+			BMF_DrawString(G.font, str);
+		}
+	}
 }
 
 void seq_reset_imageofs(SpaceSeq *sseq)

Modified: trunk/blender/source/blender/src/seqeffects.c
===================================================================
--- trunk/blender/source/blender/src/seqeffects.c	2007-10-21 19:19:53 UTC (rev 12330)
+++ trunk/blender/source/blender/src/seqeffects.c	2007-10-21 20:05:01 UTC (rev 12331)
@@ -2730,6 +2730,7 @@
 		float cursor = 0;
 
 		v->frameMap[0] = 0;
+		v->lastValidFrame = 0;
 
 		for (cfra = 1; cfra < v->length; cfra++) {
 			if(seq->ipo) {
@@ -2756,9 +2757,11 @@
 				v->frameMap[cfra] = v->length - 1;
 			} else {
 				v->frameMap[cfra] = cursor;
+				v->lastValidFrame = cfra;
 			}
 		}
 	} else {
+		v->lastValidFrame = 0;
 		for (cfra = 0; cfra < v->length; cfra++) {
 			if(seq->ipo) {
 				if((seq->flag & SEQ_IPO_FRAME_LOCKED) != 0) {
@@ -2784,6 +2787,8 @@
 			seq->facf0 *= v->globalSpeed;
 			if (seq->facf0 >= v->length) {
 				seq->facf0 = v->length - 1;
+			} else {
+				v->lastValidFrame = cfra;
 			}
 			v->frameMap[cfra] = seq->facf0;
 		}





More information about the Bf-blender-cvs mailing list