diff options
author | Richard Antalik <richardantalik@gmail.com> | 2020-06-29 15:24:46 +0300 |
---|---|---|
committer | Richard Antalik <richardantalik@gmail.com> | 2020-06-29 15:32:00 +0300 |
commit | 2476c47d7585e6c69a5b2a70ca05787ea49ceaa2 (patch) | |
tree | 8cb37329bb0fb3d29f779eee52ac53372a8ee9b2 /source | |
parent | 18bff53c997f5bfac0435b8a03ee967eed8c9e20 (diff) |
VSE: Fix type mismatch introduced in rB8bcfa0d1fb9f
Pass `IMB_Proxy_Size` to `seq_can_use_proxy` and remove duplicate check.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 7863e1f4646..297d60e5976 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -1882,19 +1882,11 @@ static ImBuf *seq_proxy_fetch(const SeqRenderData *context, Sequence *seq, int c char name[PROXY_MAXFILE]; StripProxy *proxy = seq->strip->proxy; const eSpaceSeq_Proxy_RenderSize psize = context->preview_render_size; - const IMB_Proxy_Size psize_flag = seq_rendersize_to_proxysize(psize); - int size_flags; Editing *ed = context->scene->ed; StripAnim *sanim; - if (!seq_can_use_proxy(seq, psize)) { - return NULL; - } - - size_flags = proxy->build_size_flags; - /* only use proxies, if they are enabled (even if present!) */ - if (psize_flag == IMB_PROXY_NONE || (size_flags & psize_flag) == 0) { + if (!seq_can_use_proxy(seq, seq_rendersize_to_proxysize(psize))) { return NULL; } |