diff options
| author | Richard Antalik <richardantalik@gmail.com> | 2021-11-15 22:07:46 +0300 |
|---|---|---|
| committer | Richard Antalik <richardantalik@gmail.com> | 2021-11-15 22:07:46 +0300 |
| commit | ef8240e64c9f7805ef65d9f7599bfb3eca97566c (patch) | |
| tree | 291c255f54a7d4f8e0e84d28f2fb76fef8128e31 /source/blender/sequencer | |
| parent | 62da41d63dd9fb131a3c7a1f339b49e6186b3300 (diff) | |
Fix T91992: Incorrect clip strip image size
When proxy size lower than 100% is used, clip strips are rendered with
incorrect image size.
This is because if proxies aren't enabled in movieclip, it automatically
falls back on rendering original media. Sequencer doesn't have knowledge
about this and since 9c99292a16df it assumes that image is proxy,
because it explicitly requested this size.
Check movieclip flag to see if proxies are enabled.
Reviewed By: sergey
Differential Revision: https://developer.blender.org/D13080
Diffstat (limited to 'source/blender/sequencer')
| -rw-r--r-- | source/blender/sequencer/intern/render.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/sequencer/intern/render.c b/source/blender/sequencer/intern/render.c index 4405253586b..12d97d7e3e3 100644 --- a/source/blender/sequencer/intern/render.c +++ b/source/blender/sequencer/intern/render.c @@ -1181,7 +1181,8 @@ static ImBuf *seq_render_movieclip_strip(const SeqRenderData *context, /* Try to get a proxy image. */ ibuf = seq_get_movieclip_ibuf(seq, user); - if (ibuf != NULL && psize != IMB_PROXY_NONE) { + /* If clip doesn't use proxies, it will fallback to full size render of original file. */ + if (ibuf != NULL && psize != IMB_PROXY_NONE && BKE_movieclip_proxy_enabled(seq->clip)) { *r_is_proxy_image = true; } |