[Bf-blender-cvs] [8eb7344731f] blender-v2.91-release: Fix Recursion when rendering scene strip
Richard Antalik
noreply at git.blender.org
Mon Oct 26 00:34:59 CET 2020
Commit: 8eb7344731f2e8cc910b03beb13722a31fc46f61
Author: Richard Antalik
Date: Mon Oct 26 00:31:49 2020 +0100
Branches: blender-v2.91-release
https://developer.blender.org/rB8eb7344731f2e8cc910b03beb13722a31fc46f61
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
===================================================================
M source/blender/sequencer/intern/sequencer.c
===================================================================
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;
}
More information about the Bf-blender-cvs
mailing list