diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-04-11 14:26:57 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-04-11 14:26:57 +0400 |
commit | 4f6c218f1942089e949c1dd4dae7df788d821ae2 (patch) | |
tree | 83389d098b2f9cab6b3fec356e4570a201f42324 /source | |
parent | 6300d22dabaec5dfa82fd290dc6a3036797507f8 (diff) |
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.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index e834c017ea0..dd266052b21 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; } |