[Bf-blender-cvs] [2476c47d758] master: VSE: Fix type mismatch introduced in rB8bcfa0d1fb9f

[Richard Antalik]

Commit: 2476c47d7585e6c69a5b2a70ca05787ea49ceaa2
Author: Richard Antalik
Date:   Mon Jun 29 14:24:46 2020 +0200
Branches: master
https://developer.blender.org/rB2476c47d7585e6c69a5b2a70ca05787ea49ceaa2

VSE: Fix type mismatch introduced in rB8bcfa0d1fb9f

Pass `IMB_Proxy_Size` to `seq_can_use_proxy` and remove duplicate check.

===================================================================

M	source/blender/blenkernel/intern/sequencer.c

===================================================================

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;
   }