diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-06-25 19:21:58 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-06-25 19:21:58 +0300 |
| commit | 284d294f2c17fe116619269fc5f0170cfca4b51f (patch) | |
| tree | 7028eee408a884f65d398626dcca9fecb40485b7 /source/blender/blenkernel/intern/sequencer.c | |
| parent | c0ea3099c5f18ad6f978896b560c4d015ad12a35 (diff) | |
Fix T45190 effect muting does not restore original sequencer display.
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index d4d64af6c94..21ef9feae02 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -1261,7 +1261,7 @@ static int evaluate_seq_frame_gen(Sequence **seq_arr, ListBase *seqbase, int cfr seq = seqbase->first; while (seq) { if (seq->startdisp <= cfra && seq->enddisp > cfra) { - if ((seq->type & SEQ_TYPE_EFFECT)) { + if ((seq->type & SEQ_TYPE_EFFECT) && !(seq->flag & SEQ_MUTE)) { if (seq->seq1) { effect_inputs[num_effect_inputs++] = seq->seq1; } |