diff options
author | Campbell Barton <ideasman42@gmail.com> | 2007-10-23 23:30:22 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2007-10-23 23:30:22 +0400 |
commit | 298707e5f6e4b9ee96506ac95edc9d2e7d3ee401 (patch) | |
tree | 049891a6c916e8a4bdc55ee5da1b08160c08d854 /source | |
parent | 6210fe5ad6098a6f6500f6aacf2bf84c55cae721 (diff) |
made color generated strips work like single image strips - no center frame limitation
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/include/BIF_editseq.h | 2 | ||||
-rw-r--r-- | source/blender/src/drawseq.c | 4 | ||||
-rw-r--r-- | source/blender/src/editseq.c | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/include/BIF_editseq.h b/source/blender/include/BIF_editseq.h index 54c57e3331d..d1432c7c48c 100644 --- a/source/blender/include/BIF_editseq.h +++ b/source/blender/include/BIF_editseq.h @@ -76,7 +76,7 @@ void select_dir_from_last(int lr); 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); diff --git a/source/blender/src/drawseq.c b/source/blender/src/drawseq.c index cac8b0d433e..36a857abfe1 100644 --- a/source/blender/src/drawseq.c +++ b/source/blender/src/drawseq.c @@ -691,7 +691,7 @@ static void draw_seq_strip(Sequence *seq, ScrArea *sa, SpaceSeq *sseq) 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 @@ static void draw_extra_seqinfo(void) } /* 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 diff --git a/source/blender/src/editseq.c b/source/blender/src/editseq.c index 5dd6bdde6c9..87b963a0bd7 100644 --- a/source/blender/src/editseq.c +++ b/source/blender/src/editseq.c @@ -220,9 +220,9 @@ int seq_tx_check_right(Sequence *seq) /* 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 @@ int check_single_image_seq(Sequence *seq) 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 @@ static void transform_grab_xlimits(Sequence *seq, int leftflag, int rightflag) 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 @@ static void transform_grab_xlimits(Sequence *seq, int leftflag, int rightflag) 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); } |