diff options
Diffstat (limited to 'source/blender/editors/space_sequencer/sequencer_edit.c')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_edit.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index dfc78eedf2a..3cdbc70211f 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -573,17 +573,17 @@ void change_sequence(Scene *scene) U.plugseqdir, change_plugin_seq); } else if(event==12); - /* recalculate: only new_stripdata */ + /* recalculate: only new_stripdata */ else { /* free previous effect and init new effect */ struct SeqEffectHandle sh; if (get_sequence_effect_num_inputs( - last_seq->type) - < get_sequence_effect_num_inputs( - event_to_efftype(event))) { + last_seq->type) + < get_sequence_effect_num_inputs( + event_to_efftype(event))) { error("New effect needs more " - "input strips!"); + "input strips!"); } else { sh = get_sequence_effect(last_seq); sh.free(last_seq); @@ -602,9 +602,9 @@ void change_sequence(Scene *scene) else if(last_seq->type == SEQ_IMAGE) { if(okee("Change images")) { activate_fileselect(FILE_SPECIAL, - "Select Images", - ed->act_imagedir, - reload_image_strip); + "Select Images", + ed->act_imagedir, + reload_image_strip); } } else if(last_seq->type == SEQ_MOVIE) { @@ -646,13 +646,13 @@ int seq_effect_find_selected(Scene *scene, Sequence *activeseq, int type, Sequen return 0; } if((seq != activeseq) && (seq != seq2)) { - if(seq2==0) seq2= seq; - else if(seq1==0) seq1= seq; - else if(seq3==0) seq3= seq; - else { + if(seq2==0) seq2= seq; + else if(seq1==0) seq1= seq; + else if(seq3==0) seq3= seq; + else { *error_str= "Can't apply effect to more than 3 sequence strips"; return 0; - } + } } } } @@ -716,7 +716,7 @@ void reassign_inputs_seq_effect(Scene *scene) seq_is_predecessor(seq3, last_seq) ) { //BKE_report(op->reports, RPT_ERROR, "Can't reassign inputs: no cycles allowed"); // XXX operatorify - return; + return; } last_seq->seq1 = seq1; @@ -1305,7 +1305,7 @@ static int sequencer_snap_exec(bContext *C, wmOperator *op) /* also check metas */ SEQP_BEGIN(ed, seq) { if (seq->flag & SELECT && !(seq->depth==0 && seq->flag & SEQ_LOCK) && - seq_tx_test(seq)) { + seq_tx_test(seq)) { if((seq->flag & (SEQ_LEFTSEL+SEQ_RIGHTSEL))==0) { seq->start= snap_frame-seq->startofs+seq->startstill; } else { |