diff options
| author | Richard Antalik <richardantalik@gmail.com> | 2019-03-18 22:01:40 +0300 |
|---|---|---|
| committer | Richard Antalik <richardantalik@gmail.com> | 2019-03-18 23:11:32 +0300 |
| commit | 9c99292a16df35a5d244606cc49e06949a4ef535 (patch) | |
| tree | 0cd687d8ac6474c1c3372ba2e85fc294e38f6382 /source/blender/blenkernel/intern/sequencer.c | |
| parent | b0752cd7a05187923fcbdfba974899a6039cfd2c (diff) | |
Fix T54117 Movie clip undistorted - proxy not working
Add movieclip fallback render option, for case, when proxies are not enabled or built
Reviewers: sergey
Differential Revision: https://developer.blender.org/D4219
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index f9a1eed0ba7..9609a4ab1f4 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -3060,8 +3060,9 @@ static ImBuf *seq_render_movieclip_strip(const SeqRenderData *context, Sequence BKE_movieclip_user_set_frame(&user, nr + seq->anim_startofs + seq->clip->start_frame); - user.render_size = MCLIP_PROXY_RENDER_SIZE_FULL; + user.render_flag |= MCLIP_PROXY_RENDER_USE_FALLBACK_RENDER; + user.render_size = MCLIP_PROXY_RENDER_SIZE_FULL; switch (seq_rendersize_to_proxysize(context->preview_render_size)) { case IMB_PROXY_NONE: user.render_size = MCLIP_PROXY_RENDER_SIZE_FULL; @@ -3081,14 +3082,14 @@ static ImBuf *seq_render_movieclip_strip(const SeqRenderData *context, Sequence } if (seq->clip_flag & SEQ_MOVIECLIP_RENDER_UNDISTORTED) { - user.render_flag = MCLIP_PROXY_RENDER_UNDISTORT; + user.render_flag |= MCLIP_PROXY_RENDER_UNDISTORT; } if (seq->clip_flag & SEQ_MOVIECLIP_RENDER_STABILIZED) { ibuf = BKE_movieclip_get_stable_ibuf(seq->clip, &user, tloc, &tscale, &tangle, 0); } else { - ibuf = BKE_movieclip_get_ibuf_flag(seq->clip, &user, 0, MOVIECLIP_CACHE_SKIP); + ibuf = BKE_movieclip_get_ibuf_flag(seq->clip, &user, seq->clip->flag, MOVIECLIP_CACHE_SKIP); } return ibuf; |