diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-10-20 20:29:16 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-10-20 20:29:33 +0400 |
| commit | 3ef4b3e35c54931cb4beceb9b5767ff9a4686e8c (patch) | |
| tree | 131ec64cb6a0085fb4a27b0548fd0e246f6b4812 /source | |
| parent | 6bd53bb707cbe912531f094e979ce6e5f5a97016 (diff) | |
Better fix for previous trim fix.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_edit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 1f87d6180f0..d55638ca22e 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -1279,7 +1279,7 @@ static int trim_add_sequences_rec(ListBase *seqbasep, Sequence **seq_array, bool int num_items = 0; for (seq = seqbasep->first; seq; seq = seq->next) { - if ((((seq->type & SEQ_TYPE_EFFECT) == 0) || !do_trim) && (seq->flag & SELECT)) { + if (!(seq->type & SEQ_TYPE_EFFECT) && (!do_trim || (seq->flag & SELECT))) { seq_array[offset + num_items] = seq; trim[offset + num_items] = do_trim; num_items++; @@ -1299,7 +1299,7 @@ static int trim_count_sequences_rec(ListBase *seqbasep, bool first_level) { int trimmed_sequences = 0; for (seq = seqbasep->first; seq; seq = seq->next) { - if ((((seq->type & SEQ_TYPE_EFFECT) == 0) || !first_level) && (seq->flag & SELECT)) { + if (!(seq->type & SEQ_TYPE_EFFECT) && (!first_level || (seq->flag & SELECT))) { trimmed_sequences++; if (seq->type == SEQ_TYPE_META) { |