From 1fcca29b472bcdf2ef2e6e193f7b72172f28e7f6 Mon Sep 17 00:00:00 2001 From: Richard Antalik Date: Mon, 17 Feb 2020 16:13:03 +0100 Subject: VSE: Remove atomized image duplication for preprocessing stage Each image that goes through preprocessing is already duplicated in `input_preprocess()` Reviewed By: brecht Differential Revision: https://developer.blender.org/D6790 --- source/blender/blenkernel/intern/seqeffects.c | 28 ++------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) (limited to 'source/blender/blenkernel/intern/seqeffects.c') diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c index fc5831ed132..3f9cba4cfbc 100644 --- a/source/blender/blenkernel/intern/seqeffects.c +++ b/source/blender/blenkernel/intern/seqeffects.c @@ -2973,7 +2973,6 @@ static ImBuf *do_multicam(const SeqRenderData *context, ImBuf *UNUSED(ibuf2), ImBuf *UNUSED(ibuf3)) { - ImBuf *i; ImBuf *out; Editing *ed; ListBase *seqbasep; @@ -2991,18 +2990,7 @@ static ImBuf *do_multicam(const SeqRenderData *context, return NULL; } - i = BKE_sequencer_give_ibuf_seqbase(context, cfra, seq->multicam_source, seqbasep); - if (!i) { - return NULL; - } - - if (BKE_sequencer_input_have_to_preprocess(context, seq, cfra)) { - out = IMB_dupImBuf(i); - IMB_freeImBuf(i); - } - else { - out = i; - } + out = BKE_sequencer_give_ibuf_seqbase(context, cfra, seq->multicam_source, seqbasep); return out; } @@ -3061,7 +3049,6 @@ static ImBuf *do_adjustment(const SeqRenderData *context, ImBuf *UNUSED(ibuf2), ImBuf *UNUSED(ibuf3)) { - ImBuf *i = NULL; ImBuf *out; Editing *ed; @@ -3071,18 +3058,7 @@ static ImBuf *do_adjustment(const SeqRenderData *context, return NULL; } - i = do_adjustment_impl(context, seq, cfra); - - if (BKE_sequencer_input_have_to_preprocess(context, seq, cfra)) { - out = IMB_dupImBuf(i); - if (out) { - IMB_metadata_copy(out, i); - } - IMB_freeImBuf(i); - } - else { - out = i; - } + out = do_adjustment_impl(context, seq, cfra); return out; } -- cgit v1.2.3