[Bf-blender-cvs] [284d294] master: Fix T45190 effect muting does not restore original sequencer display.

[Antony Riakiotakis]

Commit: 284d294f2c17fe116619269fc5f0170cfca4b51f
Author: Antony Riakiotakis
Date:   Thu Jun 25 18:21:58 2015 +0200
Branches: master
https://developer.blender.org/rB284d294f2c17fe116619269fc5f0170cfca4b51f

Fix T45190 effect muting does not restore original sequencer display.

===================================================================

M	source/blender/blenkernel/intern/sequencer.c

===================================================================

diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index d4d64af..21ef9fe 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;
 				}