[Bf-blender-cvs] [f3bf9b5035e] experimental-build: Revert "try fix warning"

[Jacques Lucke]

Commit: f3bf9b5035e3d3d5e2c1eb8116b1280fcc446d8c
Author: Jacques Lucke
Date:   Fri Jul 10 09:02:03 2020 +0200
Branches: experimental-build
https://developer.blender.org/rBf3bf9b5035e3d3d5e2c1eb8116b1280fcc446d8c

Revert "try fix warning"

This reverts commit 0f6b47c49d5a3ef6709d18f631b7771d2d535865.

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

M	source/blender/blenkernel/BKE_idtype.h
M	source/blender/blenkernel/intern/volume.cc

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

diff --git a/source/blender/blenkernel/BKE_idtype.h b/source/blender/blenkernel/BKE_idtype.h
index 70cd1598b64..38322427374 100644
--- a/source/blender/blenkernel/BKE_idtype.h
+++ b/source/blender/blenkernel/BKE_idtype.h
@@ -84,7 +84,7 @@ typedef enum eIDTypeInfoCacheCallbackFlags {
 typedef void (*IDTypeForeachCacheFunctionCallback)(struct ID *id,
                                                    const struct IDCacheKey *cache_key,
                                                    void **cache_p,
-                                                   eIDTypeInfoCacheCallbackFlags flags,
+                                                   uint flags,
                                                    void *user_data);
 typedef void (*IDTypeForeachCacheFunction)(struct ID *id,
                                            IDTypeForeachCacheFunctionCallback function_callback,
diff --git a/source/blender/blenkernel/intern/volume.cc b/source/blender/blenkernel/intern/volume.cc
index 1538d5db8ac..48b920c8a05 100644
--- a/source/blender/blenkernel/intern/volume.cc
+++ b/source/blender/blenkernel/intern/volume.cc
@@ -494,8 +494,7 @@ static void volume_foreach_cache(ID *id,
       /* cache_v */ volume->runtime.grids,
   };
 
-  function_callback(
-      id, &key, (void **)&volume->runtime.grids, (eIDTypeInfoCacheCallbackFlags)0, user_data);
+  function_callback(id, &key, (void **)&volume->runtime.grids, 0, user_data);
 }
 
 IDTypeInfo IDType_ID_VO = {