[Bf-blender-cvs] [3335f852a12] master: Cleanup: mixing enum/non-enum type warning in conditional expression

[Campbell Barton]

Commit: 3335f852a12973d4cb462d1f73a5cd734a313494
Author: Campbell Barton
Date:   Tue Aug 10 12:04:17 2021 +1000
Branches: master
https://developer.blender.org/rB3335f852a12973d4cb462d1f73a5cd734a313494

Cleanup: mixing enum/non-enum type warning in conditional expression

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

M	source/blender/editors/animation/keyframes_keylist.cc

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

diff --git a/source/blender/editors/animation/keyframes_keylist.cc b/source/blender/editors/animation/keyframes_keylist.cc
index 85036efc983..916d7de0635 100644
--- a/source/blender/editors/animation/keyframes_keylist.cc
+++ b/source/blender/editors/animation/keyframes_keylist.cc
@@ -294,7 +294,7 @@ static void nupdate_ak_bezt(void *node, void *data)
   }
 
   /* For interpolation type, select the highest value (enum is sorted). */
-  ak->handle_type = MAX2(ak->handle_type, bezt_handle_type(bezt));
+  ak->handle_type = MAX2((eKeyframeHandleDrawOpts)ak->handle_type, bezt_handle_type(bezt));
 
   /* For extremes, detect when combining different states. */
   const char new_extreme = bezt_extreme_type(chain);