archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Better fix for previous trim fix.

Browse Source
This commit is contained in:
Antonis Ryakiotakis
2014-10-20 18:29:16 +02:00
parent 6bd53bb707
commit 3ef4b3e35c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/space_sequencer/sequencer_edit.c
View File

@@ -1279,7 +1279,7 @@ static int trim_add_sequences_rec(ListBase *seqbasep, Sequence **seq_array, bool
int num_items = 0; int num_items = 0;
for (seq = seqbasep->first; seq; seq = seq->next) { 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; seq_array[offset + num_items] = seq;
trim[offset + num_items] = do_trim; trim[offset + num_items] = do_trim;
num_items++; num_items++;
@@ -1299,7 +1299,7 @@ static int trim_count_sequences_rec(ListBase *seqbasep, bool first_level) {
int trimmed_sequences = 0; int trimmed_sequences = 0;
for (seq = seqbasep->first; seq; seq = seq->next) { 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++; trimmed_sequences++;
if (seq->type == SEQ_TYPE_META) { if (seq->type == SEQ_TYPE_META) {