diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2020-08-27 04:14:17 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2020-08-27 04:14:17 +0300 |
| commit | 489b5790cf182b5b25d2594499de5f5fee518dec (patch) | |
| tree | 716eb287acc394d4d5fb1ca87fa70ce724d8c6fa /source/blender | |
| parent | 6438fc4f794bd8e6f1eedc48c3812e907ecc059a (diff) | |
Cleanup: Fix build warning with MSVC
`IDTypeForeachCacheFunctionCallback` lists the `flags` parameter
as `uint`, having these functions use `eIDTypeInfoCacheCallbackFlags`
results in the following warning when building with MSVC:
warning C4028: formal parameter 4 different from declaration
This change resolves this warning by changing the parameter to
the appropriate type.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 60cb3d6c359..deeffcee39e 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -1981,7 +1981,7 @@ typedef struct BLOCacheStorage { static void blo_cache_storage_entry_register(ID *id, const IDCacheKey *key, void **UNUSED(cache_p), - eIDTypeInfoCacheCallbackFlags UNUSED(flags), + uint UNUSED(flags), void *cache_storage_v) { BLI_assert(key->id_session_uuid == id->session_uuid); @@ -1998,8 +1998,7 @@ static void blo_cache_storage_entry_register(ID *id, /** Restore a cache data entry from old ID into new one, when reading some undo memfile. */ static void blo_cache_storage_entry_restore_in_new(ID *UNUSED(id), const IDCacheKey *key, - void **cache_p, - eIDTypeInfoCacheCallbackFlags flags, + void **cache_p, uint flags, void *cache_storage_v) { BLOCacheStorage *cache_storage = cache_storage_v; @@ -2027,7 +2026,7 @@ static void blo_cache_storage_entry_restore_in_new(ID *UNUSED(id), static void blo_cache_storage_entry_clear_in_old(ID *UNUSED(id), const IDCacheKey *key, void **cache_p, - eIDTypeInfoCacheCallbackFlags UNUSED(flags), + uint UNUSED(flags), void *cache_storage_v) { BLOCacheStorage *cache_storage = cache_storage_v; |