diff options
| author | Peter Schlaile <peter@schlaile.de> | 2010-04-25 19:39:04 +0400 |
|---|---|---|
| committer | Peter Schlaile <peter@schlaile.de> | 2010-04-25 19:39:04 +0400 |
| commit | 4f6e3dad47946490facbb8121a35d7ac727d2416 (patch) | |
| tree | 2002a69a0a11a6f7f765b79f22116ba95b02554f /source/blender | |
| parent | 93f420b6669bd17646255b0990b0904681718da8 (diff) | |
== Sequencer ==
Forgot some changes for multicam support.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_edit.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 8de093cd845..9b3c613aef2 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -795,6 +795,7 @@ static char *give_seqname_by_type(int type) case SEQ_GLOW: return "Glow"; case SEQ_TRANSFORM: return "Transform"; case SEQ_COLOR: return "Color"; + case SEQ_MULTICAM: return "Multicam"; case SEQ_SPEED: return "Speed"; default: return 0; @@ -3449,7 +3450,8 @@ void seq_tx_set_final_right(Sequence *seq, int val) since they work a bit differently to normal image seq's (during transform) */ int seq_single_check(Sequence *seq) { - if ( seq->len==1 && (seq->type == SEQ_IMAGE || seq->type == SEQ_COLOR)) + if ( seq->len==1 && (seq->type == SEQ_IMAGE || seq->type == SEQ_COLOR + || seq->type == SEQ_MULTICAM)) return 1; else return 0; diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index bc6efc19648..11a55ebb421 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -2539,9 +2539,9 @@ static int sequencer_swap_exec(bContext *C, wmOperator *op) if(seq) { /* disallow effect strips */ - if ((seq->type!=SEQ_COLOR) && (seq->effectdata || seq->seq1 || seq->seq2 || seq->seq3)) + if (get_sequence_effect_num_inputs(seq->type) >= 1 && (seq->effectdata || seq->seq1 || seq->seq2 || seq->seq3)) return OPERATOR_CANCELLED; - if ((active_seq->type!=SEQ_COLOR) && (active_seq->effectdata || active_seq->seq1 || active_seq->seq2 || active_seq->seq3)) + if ((get_sequence_effect_num_inputs(active_seq->type) >= 1) && (active_seq->effectdata || active_seq->seq1 || active_seq->seq2 || active_seq->seq3)) return OPERATOR_CANCELLED; switch (side) { |