[Bf-blender-cvs] [cfea716128c] blender-v2.83-release: Fix error mixing incompatible enums when generating the proxy name

[Campbell Barton]

Commit: cfea716128cfc8236d52a148e39a71b03e1f4836
Author: Campbell Barton
Date:   Mon May 18 16:12:17 2020 +1000
Branches: blender-v2.83-release
https://developer.blender.org/rBcfea716128cfc8236d52a148e39a71b03e1f4836

Fix error mixing incompatible enums when generating the proxy name

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

M	source/blender/blenkernel/intern/sequencer.c
M	source/blender/editors/render/render_opengl.c

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

diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 53357546669..d0527a2635a 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -1910,9 +1910,10 @@ static bool seq_proxy_get_fname(Editing *ed,
 static ImBuf *seq_proxy_fetch(const SeqRenderData *context, Sequence *seq, int cfra)
 {
   char name[PROXY_MAXFILE];
-  IMB_Proxy_Size psize = seq_rendersize_to_proxysize(context->preview_render_size);
-  int size_flags;
   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;
 
@@ -1923,7 +1924,7 @@ static ImBuf *seq_proxy_fetch(const SeqRenderData *context, Sequence *seq, int c
   size_flags = proxy->build_size_flags;
 
   /* only use proxies, if they are enabled (even if present!) */
-  if (psize == IMB_PROXY_NONE || (size_flags & psize) == 0) {
+  if (psize_flag == IMB_PROXY_NONE || (size_flags & psize_flag) == 0) {
     return NULL;
   }
 
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index f35f92feaec..87ba5ca630f 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -495,7 +495,7 @@ static void screen_opengl_render_apply(const bContext *C, OGLRender *oglrender)
                                   scene,
                                   oglrender->sizex,
                                   oglrender->sizey,
-                                  100.0f,
+                                  100,
                                   false,
                                   &context);