Commit: f4cb93b55d4117a32ff1d491464b9322908d7c8d
Author: Richard Antalik
Date: Mon Feb 1 11:03:13 2021 +0100
Branches: master
https://developer.blender.org/rBf4cb93b55d4117a32ff1d491464b9322908d7c8d
Merge branch 'blender-v2.92-release'
===================================================================
===================================================================
diff --cc source/blender/sequencer/intern/render.c
index db317ffe7d6,0ab2a67e560..b564ecd3f36
--- a/source/blender/sequencer/intern/render.c
+++ b/source/blender/sequencer/intern/render.c
@@@ -734,10 -766,10 +766,10 @@@ static ImBuf *seq_render_preprocess_ibu
}
if (use_preprocess) {
- ibuf = input_preprocess(context, seq, timeline_frame, ibuf);
+ ibuf = input_preprocess(context, seq, timeline_frame, ibuf,
is_proxy_image);
}
- seq_cache_put(context, seq, timeline_frame, SEQ_CACHE_STORE_PREPROCESSED,
ibuf, false);
+ seq_cache_put(context, seq, timeline_frame, SEQ_CACHE_STORE_PREPROCESSED,
ibuf);
return ibuf;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
