From 64c222ff58577b80994a11fa63c137b89a3083fc Mon Sep 17 00:00:00 2001 From: Richard Antalik Date: Sun, 29 Sep 2019 16:17:48 -0700 Subject: Fix T69334: VSE Very low framerate Revert "Sequencer: use Alpha Over blend mode by default" This reverts commit 7c6c5b40cae47e2ecb0e2ef2a5ca1883270c0023. Reviewed By: brecht Differential Revision: https://developer.blender.org/D5943 --- source/blender/blenkernel/intern/sequencer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'source/blender/blenkernel/intern/sequencer.c') diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 497eefe34ee..3e88db787ee 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -5544,7 +5544,7 @@ Sequence *BKE_sequencer_add_image_strip(bContext *C, ListBase *seqbasep, SeqLoad Strip *strip; seq = BKE_sequence_alloc(seqbasep, seq_load->start_frame, seq_load->channel, SEQ_TYPE_IMAGE); - seq->blend_mode = SEQ_TYPE_ALPHAOVER; + seq->blend_mode = SEQ_TYPE_CROSS; /* so alpha adjustment fade to the strip below */ /* basic defaults */ seq->len = seq_load->len ? seq_load->len : 1; @@ -5703,7 +5703,9 @@ Sequence *BKE_sequencer_add_movie_strip(bContext *C, ListBase *seqbasep, SeqLoad seq->views_format = seq_load->views_format; } seq->flag |= seq_load->flag & SEQ_USE_VIEWS; - seq->blend_mode = SEQ_TYPE_ALPHAOVER; + + seq->type = SEQ_TYPE_MOVIE; + seq->blend_mode = SEQ_TYPE_CROSS; /* so alpha adjustment fade to the strip below */ for (i = 0; i < totfiles; i++) { if (anim_arr[i]) { -- cgit v1.2.3