Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <b.mont29@gmail.com>2020-02-12 12:45:21 +0300
committerBastien Montagne <b.mont29@gmail.com>2020-02-12 12:46:53 +0300
commit0e15850a7eedbdf236e977c663efaceff23572e1 (patch)
tree7868b772a3b7f46d97bf2e729703280f5172cdc2
parente32457952b45e5df7c3fc7d3e948e1403c7452da (diff)
Cleanup: clang-format.
-rw-r--r--source/blender/blenkernel/intern/pbvh_bmesh.c4
-rw-r--r--source/blender/blenlib/BLI_compiler_compat.h34
-rw-r--r--source/blender/editors/screen/area.c2
-rw-r--r--source/blender/makesdna/DNA_modifier_types.h2
4 files changed, 21 insertions, 21 deletions
diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c
index d4115dc0080..9f7b6be18a7 100644
--- a/source/blender/blenkernel/intern/pbvh_bmesh.c
+++ b/source/blender/blenkernel/intern/pbvh_bmesh.c
@@ -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,
diff --git a/source/blender/blenlib/BLI_compiler_compat.h b/source/blender/blenlib/BLI_compiler_compat.h
index 312991e7f15..bd1cd327d3c 100644
--- a/source/blender/blenlib/BLI_compiler_compat.h
+++ b/source/blender/blenlib/BLI_compiler_compat.h
@@ -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__ */
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index c85beefe1f4..26c48dda4f4 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -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
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 474e9107bc4..918b4a2a7ea 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -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 */