Commit: 54b47da56596298a6d880d334a2c403862855ae9
Author: Campbell Barton
Date: Thu Aug 27 15:33:33 2020 +1000
Branches: master
https://developer.blender.org/rB54b47da56596298a6d880d334a2c403862855ae9
Cleanup: clang-format
===================================================================
M source/blender/blenlib/BLI_array.h
M source/blender/blenloader/intern/readfile.c
===================================================================
diff --git a/source/blender/blenlib/BLI_array.h
b/source/blender/blenlib/BLI_array.h
index 88cbbbc5fa6..4e37314ed3e 100644
--- a/source/blender/blenlib/BLI_array.h
+++ b/source/blender/blenlib/BLI_array.h
@@ -117,7 +117,7 @@ void _bli_array_grow_func(void **arr_p,
{ \
if (arr && (char *)arr != _##arr##_static) { \
BLI_array_fake_user(arr); \
- MEM_freeN((void*)arr); \
+ MEM_freeN((void *)arr); \
} \
} \
((void)0)
diff --git a/source/blender/blenloader/intern/readfile.c
b/source/blender/blenloader/intern/readfile.c
index deeffcee39e..304ba87402c 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -1996,10 +1996,8 @@ 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, uint flags,
- void *cache_storage_v)
+static void blo_cache_storage_entry_restore_in_new(
+ ID *UNUSED(id), const IDCacheKey *key, void **cache_p, uint flags, void
*cache_storage_v)
{
BLOCacheStorage *cache_storage = cache_storage_v;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
