blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Cleanup: clang-format.

This commit is contained in:
Bastien Montagne 2020-02-12 10:45:21 +01:00
parent e32457952b
commit 0e15850a7e
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/pbvh_bmesh.c
View File

@ -1977,7 +1977,7 @@ bool BKE_pbvh_bmesh_update_topology(PBVH *bvh,
if (mode & PBVH_Collapse) {
EdgeQueue q;
BLI_mempool *queue_pool = BLI_mempool_create(sizeof(BMVert *[2]), 0, 128, BLI_MEMPOOL_NOP);
BLI_mempool *queue_pool = BLI_mempool_create(sizeof(BMVert * [2]), 0, 128, BLI_MEMPOOL_NOP);
EdgeQueueContext eq_ctx = {
&q,
queue_pool,
@ -1996,7 +1996,7 @@ bool BKE_pbvh_bmesh_update_topology(PBVH *bvh,
if (mode & PBVH_Subdivide) {
EdgeQueue q;
BLI_mempool *queue_pool = BLI_mempool_create(sizeof(BMVert *[2]), 0, 128, BLI_MEMPOOL_NOP);
BLI_mempool *queue_pool = BLI_mempool_create(sizeof(BMVert * [2]), 0, 128, BLI_MEMPOOL_NOP);
EdgeQueueContext eq_ctx = {
&q,
queue_pool,

34
source/blender/blenlib/BLI_compiler_compat.h
View File

@ -15,7 +15,7 @@
*/
#ifndef __BLI_COMPILER_COMPAT_H__
#define __BLI_COMPILER_COMPAT_H__
# define __BLI_COMPILER_COMPAT_H__
/** \file
* \ingroup bli
@ -23,32 +23,32 @@
* Use to help with cross platform portability.
*/
#if defined(_MSC_VER)
# define alloca _alloca
#endif
# if defined(_MSC_VER)
# define alloca _alloca
# endif
#if (defined(__GNUC__) || defined(__clang__)) && defined(__cplusplus)
# if (defined(__GNUC__) || defined(__clang__)) && defined(__cplusplus)
extern "C++" {
/* Some magic to be sure we don't have reference in the type. */
template<typename T> static inline T decltype_helper(T x)
{
return x;
}
# define typeof(x) decltype(decltype_helper(x))
# define typeof(x) decltype(decltype_helper(x))
}
#endif
# endif
/* little macro so inline keyword works */
#if defined(_MSC_VER)
# define BLI_INLINE static __forceinline
#else
# define BLI_INLINE static inline __attribute__((always_inline)) __attribute__((__unused__))
#endif
# if defined(_MSC_VER)
# define BLI_INLINE static __forceinline
# else
# define BLI_INLINE static inline __attribute__((always_inline)) __attribute__((__unused__))
# endif
#if defined(__GNUC__)
# define BLI_NOINLINE __attribute__((noinline))
#else
# define BLI_NOINLINE
#endif
# if defined(__GNUC__)
# define BLI_NOINLINE __attribute__((noinline))
# else
# define BLI_NOINLINE
# endif
#endif /* __BLI_COMPILER_COMPAT_H__ */

2
source/blender/editors/screen/area.c
View File

@ -2927,7 +2927,7 @@ void ED_region_info_draw(ARegion *ar,
float fill_color[4],
const bool full_redraw)
{
ED_region_info_draw_multiline(ar, (const char *[2]){text, NULL}, fill_color, full_redraw);
ED_region_info_draw_multiline(ar, (const char * [2]){text, NULL}, fill_color, full_redraw);
}
#define MAX_METADATA_STR 1024

2
source/blender/makesdna/DNA_modifier_types.h
View File

@ -703,7 +703,7 @@ typedef struct ArmatureModifierData {
enum {
MOD_HOOK_UNIFORM_SPACE = (1 << 0),
MOD_HOOK_INVERT_VGROUP = (1 << 1)
MOD_HOOK_INVERT_VGROUP = (1 << 1),
};
/* same as WarpModifierFalloff */