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:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-09-24 19:26:59 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-09-24 19:26:59 +0400
commit81dc928e50d4a1350d099fa2890e8bfdfea502ac (patch)
tree0c0095a8727795a618722ef5e44db897ad7dbb23 /source/blender/blenkernel/intern/sequencer.c
parent9cb33ec68f742928abbc907585a52c2f5b1465b0 (diff)
Sequencer: movie clip float buffers should be converted to internal sequencer space
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
-rw-r--r--source/blender/blenkernel/intern/sequencer.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 216ac0875c7..f9d4b07690b 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -2585,13 +2585,13 @@ static ImBuf *do_render_strip_uncached(SeqRenderData context, Sequence *seq, flo
ibuf = seq_render_movieclip_strip(context, seq, nr);
if (ibuf) {
- if (use_preprocess) {
- ImBuf *i = IMB_dupImBuf(ibuf);
-
- IMB_freeImBuf(ibuf);
+ /* duplicate frame so movie cache wouldn't be confused by sequencer's stuff */
+ ImBuf *i = IMB_dupImBuf(ibuf);
+ IMB_freeImBuf(ibuf);
+ ibuf = i;
- ibuf = i;
- }
+ if (ibuf->rect_float)
+ BKE_sequencer_imbuf_to_sequencer_space(context.scene, ibuf, FALSE);
copy_to_ibuf_still(context, seq, nr, ibuf);
}