Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Antalik <richardantalik@gmail.com>2020-02-17 18:13:03 +0300
committerRichard Antalik <richardantalik@gmail.com>2020-02-17 18:46:59 +0300
commit1fcca29b472bcdf2ef2e6e193f7b72172f28e7f6 (patch)
tree79a12d7f00bc8e0f835e8866d2158081c9e6ea0d /source/blender/blenkernel/intern/seqeffects.c
parent18b693bdbd6bac7c381e46aa4b95c3e81494855e (diff)
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
Diffstat (limited to 'source/blender/blenkernel/intern/seqeffects.c')
-rw-r--r--source/blender/blenkernel/intern/seqeffects.c28
1 files changed, 2 insertions, 26 deletions
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;
}