[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12362] trunk/blender/source/blender: made color generated strips work like single image strips - no center frame limitation

[Campbell Barton]

Revision: 12362
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12362
Author:   campbellbarton
Date:     2007-10-23 21:30:22 +0200 (Tue, 23 Oct 2007)

Log Message:
-----------
made color generated strips work like single image strips - no center frame limitation

Modified Paths:
--------------
    trunk/blender/source/blender/include/BIF_editseq.h
    trunk/blender/source/blender/src/drawseq.c
    trunk/blender/source/blender/src/editseq.c

Modified: trunk/blender/source/blender/include/BIF_editseq.h
===================================================================
--- trunk/blender/source/blender/include/BIF_editseq.h	2007-10-23 18:56:43 UTC (rev 12361)
+++ trunk/blender/source/blender/include/BIF_editseq.h	2007-10-23 19:30:22 UTC (rev 12362)
@@ -76,7 +76,7 @@
 void				select_neighbor_from_last(int lr);
 void				select_linked_seq(int mode);
 struct Sequence*	alloc_sequence(ListBase *lb, int cfra, int machine); /*used from python*/
-int 				check_single_image_seq(struct Sequence *seq);
+int 				check_single_seq(struct Sequence *seq);
 
 /* sequence transform functions, for internal used */
 int seq_tx_get_start(struct Sequence *seq);

Modified: trunk/blender/source/blender/src/drawseq.c
===================================================================
--- trunk/blender/source/blender/src/drawseq.c	2007-10-23 18:56:43 UTC (rev 12361)
+++ trunk/blender/source/blender/src/drawseq.c	2007-10-23 19:30:22 UTC (rev 12362)
@@ -691,7 +691,7 @@
 	Sequence *last_seq = get_last_seq();
 
 	/* we need to know if this is a single image or not for drawing */
-	is_single_image = (char)check_single_image_seq(seq);
+	is_single_image = (char)check_single_seq(seq);
 	
 	/* body */
 	if(seq->startstill) x1= seq->start;
@@ -901,7 +901,7 @@
 	}
 
 	/* LEN, dont bother with single images */
-	if (check_single_image_seq(last_seq)==0) {
+	if (check_single_seq(last_seq)==0) {
 		if(last_seq->type & SEQ_EFFECT)
 			sprintf(str, "len: %d   From %d - %d", last_seq->len, last_seq->startdisp, last_seq->enddisp-1);
 		else

Modified: trunk/blender/source/blender/src/editseq.c
===================================================================
--- trunk/blender/source/blender/src/editseq.c	2007-10-23 18:56:43 UTC (rev 12361)
+++ trunk/blender/source/blender/src/editseq.c	2007-10-23 19:30:22 UTC (rev 12362)
@@ -220,9 +220,9 @@
 
 /* used so we can do a quick check for single image seq
    since they work a bit differently to normal image seq's (during transform) */
-int check_single_image_seq(Sequence *seq)
+int check_single_seq(Sequence *seq)
 {
-	if (seq->type == SEQ_IMAGE && seq->len == 1 )
+	if ( seq->len==1 && (seq->type == SEQ_IMAGE || seq->type == SEQ_COLOR))
 		return 1;
 	else
 		return 0;
@@ -231,7 +231,7 @@
 static void fix_single_image_seq(Sequence *seq)
 {
 	int left, start, offset;
-	if (!check_single_image_seq(seq))
+	if (!check_single_seq(seq))
 		return;
 	
 	/* make sure the image is always at the start since there is only one,
@@ -2673,7 +2673,7 @@
 			seq_tx_set_final_left(seq, seq_tx_get_final_right(seq)-1);
 		}
 		
-		if (check_single_image_seq(seq)==0) {
+		if (check_single_seq(seq)==0) {
 			if (seq_tx_get_final_left(seq) >= seq_tx_get_end(seq)) {
 				seq_tx_set_final_left(seq, seq_tx_get_end(seq)-1);
 			}
@@ -2695,7 +2695,7 @@
 			seq_tx_set_final_right(seq, seq_tx_get_final_left(seq)+1);
 		}
 									
-		if (check_single_image_seq(seq)==0) {
+		if (check_single_seq(seq)==0) {
 			if (seq_tx_get_final_right(seq) <= seq_tx_get_start(seq)) {
 				seq_tx_set_final_right(seq, seq_tx_get_start(seq)+1);
 			}