diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-27 16:49:59 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-27 16:49:59 +0300 |
| commit | 58adc586612e695d04033f2029362f279a9c05a4 (patch) | |
| tree | 0ebe8d1958f179e54a07eb44456002d46816a593 /source/blender/editors/space_sequencer/sequencer_edit.c | |
| parent | 0f6b2504f80edddc76c104e9df0722fbb7d484a7 (diff) | |
| parent | a247b53084760498ca81eb6bdb901dee8f3a02ca (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_sequencer/sequencer_edit.c')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_edit.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 083b4548b29..2ffc3971e18 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -560,7 +560,7 @@ int seq_effect_find_selected(Scene *scene, Sequence *activeseq, int type, Sequen switch (BKE_sequence_effect_get_num_inputs(type)) { case 0: *selseq1 = *selseq2 = *selseq3 = NULL; - return 1; /* succsess */ + return 1; /* success */ case 1: if (seq2 == NULL) { *error_str = N_("At least one selected sequence strip is needed"); @@ -1379,7 +1379,7 @@ static int sequencer_slip_invoke(bContext *C, wmOperator *op, const wmEvent *eve int num_seq, i; View2D *v2d = UI_view2d_fromcontext(C); - /* first recursively cound the trimmed elements */ + /* first recursively count the trimmed elements */ num_seq = slip_count_sequences_rec(ed->seqbasep, true); if (num_seq == 0) @@ -1487,7 +1487,7 @@ static int sequencer_slip_exec(bContext *C, wmOperator *op) int offset = RNA_int_get(op->ptr, "offset"); bool success = false; - /* first recursively cound the trimmed elements */ + /* first recursively count the trimmed elements */ num_seq = slip_count_sequences_rec(ed->seqbasep, true); if (num_seq == 0) @@ -2652,7 +2652,7 @@ static int sequencer_meta_separate_exec(bContext *C, wmOperator *UNUSED(op)) BLI_remlink(ed->seqbasep, last_seq); BKE_sequence_free(scene, last_seq); - /* emtpy meta strip, delete all effects depending on it */ + /* empty meta strip, delete all effects depending on it */ for (seq = ed->seqbasep->first; seq; seq = seq->next) if ((seq->type & SEQ_TYPE_EFFECT) && seq_depends_on_meta(seq, last_seq)) seq->flag |= SEQ_FLAG_DELETE; |