diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2017-12-29 02:10:27 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-01-08 19:16:46 +0300 |
| commit | 8f7030e5f36be914bf33c52182bc123ad10ce682 (patch) | |
| tree | 953a43365b1220be4a505cbc0e2e56d1e7d186f0 | |
| parent | 405874bd79b4e9fbc6b2d4534997038367b47d42 (diff) | |
Fix T53639: text sequence strips no stamped into render.
Differential Revision: https://developer.blender.org/D2977
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 8e36abd3ca6..c8767e518f2 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -4477,8 +4477,10 @@ Sequence *BKE_sequencer_foreground_frame_get(Scene *scene, int frame) for (seq = ed->seqbasep->first; seq; seq = seq->next) { if (seq->flag & SEQ_MUTE || seq->startdisp > frame || seq->enddisp <= frame) continue; - /* only use elements you can see - not */ - if (ELEM(seq->type, SEQ_TYPE_IMAGE, SEQ_TYPE_META, SEQ_TYPE_SCENE, SEQ_TYPE_MOVIE, SEQ_TYPE_COLOR)) { + /* Only use strips that generate an image, not ones that combine + * other strips or apply some effect. */ + if (ELEM(seq->type, SEQ_TYPE_IMAGE, SEQ_TYPE_META, SEQ_TYPE_SCENE, + SEQ_TYPE_MOVIE, SEQ_TYPE_COLOR, SEQ_TYPE_TEXT)) { if (seq->machine > best_machine) { best_seq = seq; best_machine = seq->machine; |