[Bf-blender-cvs] [4f6c218] master: Fix T39584: Effects strips render black

[Sergey Sharybin]

Commit: 4f6c218f1942089e949c1dd4dae7df788d821ae2
Author: Sergey Sharybin
Date:   Fri Apr 11 16:26:57 2014 +0600
https://developer.blender.org/rB4f6c218f1942089e949c1dd4dae7df788d821ae2

Fix T39584: Effects strips render black

It's possible that effetc strip would be placed to the same
'machine' as it's inputs. We don't want to clear such strips
from the stack.

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

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

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

diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index e834c01..dd26605 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -1188,11 +1188,18 @@ static int evaluate_seq_frame_gen(Sequence **seq_arr, ListBase *seqbase, int cfr
 	}
 
 	/* Drop strips which are used for effect inputs, we don't want
-	 *them to blend into render stack in any other way than effect
+	 * them to blend into render stack in any other way than effect
 	 * string rendering.
 	 */
 	for (i = 0; i < num_effect_inputs; i++) {
 		seq = effect_inputs[i];
+		/* It's possible that effetc strip would be placed to the same
+		 * 'machine' as it's inputs. We don't want to clear such strips
+		 * from the stack.
+		 */
+		if (seq_arr[seq->machine] && seq_arr[seq->machine]->type & SEQ_TYPE_EFFECT) {
+			continue;
+		}
 		seq_arr[seq->machine] = NULL;
 	}