diff options
author | Richard Antalik <richardantalik@gmail.com> | 2020-10-26 02:31:49 +0300 |
---|---|---|
committer | Richard Antalik <richardantalik@gmail.com> | 2020-10-26 02:31:49 +0300 |
commit | 8eb7344731f2e8cc910b03beb13722a31fc46f61 (patch) | |
tree | 1d206dd3971144babd12fe1a8b4f08b66cc4e46a | |
parent | 3deb4f4cb8ba4558adbb24597fb799252449a799 (diff) |
Fix Recursion when rendering scene strip
Recursion happens in case when scene strip point to it's own scene
indirectly by using SEQ_SCENE_STRIPS option.
Reviewed By: sergey
Differential Revision: https://developer.blender.org/D9264
-rw-r--r-- | source/blender/sequencer/intern/sequencer.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/sequencer/intern/sequencer.c b/source/blender/sequencer/intern/sequencer.c index c8dfb6b886f..068d836d1e6 100644 --- a/source/blender/sequencer/intern/sequencer.c +++ b/source/blender/sequencer/intern/sequencer.c @@ -6045,6 +6045,12 @@ static Sequence *sequencer_check_scene_recursion(Scene *scene, ListBase *seqbase return seq; } + if (seq->type == SEQ_TYPE_SCENE && (seq->flag & SEQ_SCENE_STRIPS)) { + if (sequencer_check_scene_recursion(scene, &seq->scene->ed->seqbase)) { + return seq; + } + } + if (seq->type == SEQ_TYPE_META && sequencer_check_scene_recursion(scene, &seq->seqbase)) { return seq; } |