[Bf-blender-cvs] [a6504aa64bb] master: Cleanup: clang-format

Campbell Barton noreply at git.blender.org
Sun Apr 24 05:48:22 CEST 2022


Commit: a6504aa64bb0e33d112cd21b9d98db77530f14a4
Author: Campbell Barton
Date:   Sun Apr 24 13:37:01 2022 +1000
Branches: master
https://developer.blender.org/rBa6504aa64bb0e33d112cd21b9d98db77530f14a4

Cleanup: clang-format

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

M	source/blender/bmesh/bmesh_class.h
M	source/blender/draw/intern/draw_hair_private.h
M	source/blender/editors/object/object_remesh.cc

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

diff --git a/source/blender/bmesh/bmesh_class.h b/source/blender/bmesh/bmesh_class.h
index 3e405064c5a..0246850123a 100644
--- a/source/blender/bmesh/bmesh_class.h
+++ b/source/blender/bmesh/bmesh_class.h
@@ -517,7 +517,6 @@ typedef bool (*BMLoopPairFilterFunc)(const BMLoop *, const BMLoop *, void *user_
 #define BM_ELEM_CD_GET_BOOL(ele, offset) \
   (BLI_assert(offset != -1), *((bool *)((char *)(ele)->head.data + (offset))))
 
-
 #if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)
 #  define BM_ELEM_CD_GET_VOID_P(ele, offset) \
     (BLI_assert(offset != -1), \
@@ -552,39 +551,35 @@ typedef bool (*BMLoopPairFilterFunc)(const BMLoop *, const BMLoop *, void *user_
               GENERIC_TYPE_ANY((const float *)POINTER_OFFSET((ele)->head.data, offset), \
                                _BM_GENERIC_TYPE_ELEM_CONST)))
 
-
 #  define BM_ELEM_CD_GET_FLOAT2_P(ele, offset) \
     (BLI_assert(offset != -1), \
      _Generic(ele, \
-              GENERIC_TYPE_ANY((float (*)[2])POINTER_OFFSET((ele)->head.data, offset), \
+              GENERIC_TYPE_ANY((float(*)[2])POINTER_OFFSET((ele)->head.data, offset), \
                                _BM_GENERIC_TYPE_ELEM_NONCONST), \
-              GENERIC_TYPE_ANY((const float (*)[2])POINTER_OFFSET((ele)->head.data, offset), \
+              GENERIC_TYPE_ANY((const float(*)[2])POINTER_OFFSET((ele)->head.data, offset), \
                                _BM_GENERIC_TYPE_ELEM_CONST)))
 
 #  define BM_ELEM_CD_GET_FLOAT3_P(ele, offset) \
     (BLI_assert(offset != -1), \
      _Generic(ele, \
-              GENERIC_TYPE_ANY((float (*)[3])POINTER_OFFSET((ele)->head.data, offset), \
+              GENERIC_TYPE_ANY((float(*)[3])POINTER_OFFSET((ele)->head.data, offset), \
                                _BM_GENERIC_TYPE_ELEM_NONCONST), \
-              GENERIC_TYPE_ANY((const float (*)[3])POINTER_OFFSET((ele)->head.data, offset), \
+              GENERIC_TYPE_ANY((const float(*)[3])POINTER_OFFSET((ele)->head.data, offset), \
                                _BM_GENERIC_TYPE_ELEM_CONST)))
 
-
 #else
 
 #  define BM_ELEM_CD_GET_FLOAT_P(ele, offset) \
     (BLI_assert(offset != -1), (float *)((char *)(ele)->head.data + (offset)))
 
 #  define BM_ELEM_CD_GET_FLOAT2_P(ele, offset) \
-    (BLI_assert(offset != -1), (float (*)[2])((char *)(ele)->head.data + (offset)))
+    (BLI_assert(offset != -1), (float(*)[2])((char *)(ele)->head.data + (offset)))
 
 #  define BM_ELEM_CD_GET_FLOAT3_P(ele, offset) \
-    (BLI_assert(offset != -1), (float (*)[3])((char *)(ele)->head.data + (offset)))
+    (BLI_assert(offset != -1), (float(*)[3])((char *)(ele)->head.data + (offset)))
 
 #endif
 
-
-
 #define BM_ELEM_CD_SET_FLOAT2(ele, offset, f) \
   { \
     CHECK_TYPE_NONCONST(ele); \
diff --git a/source/blender/draw/intern/draw_hair_private.h b/source/blender/draw/intern/draw_hair_private.h
index c605a4c1587..5d84c8863f2 100644
--- a/source/blender/draw/intern/draw_hair_private.h
+++ b/source/blender/draw/intern/draw_hair_private.h
@@ -75,7 +75,6 @@ typedef struct ParticleHairCache {
   int point_len;
 } ParticleHairCache;
 
-
 /**
  * Ensure all textures and buffers needed for GPU accelerated drawing.
  */
diff --git a/source/blender/editors/object/object_remesh.cc b/source/blender/editors/object/object_remesh.cc
index b65e76a5031..ba2efa6e517 100644
--- a/source/blender/editors/object/object_remesh.cc
+++ b/source/blender/editors/object/object_remesh.cc
@@ -341,7 +341,13 @@ static void voxel_size_edit_draw(const bContext *C, ARegion *UNUSED(ar), void *a
   short strdrawlen = 0;
   Scene *scene = CTX_data_scene(C);
   UnitSettings *unit = &scene->unit;
-  BKE_unit_value_as_string(str, VOXEL_SIZE_EDIT_MAX_STR_LEN, (double)(cd->voxel_size * unit->scale_length), 4, B_UNIT_LENGTH, unit, true);
+  BKE_unit_value_as_string(str,
+                           VOXEL_SIZE_EDIT_MAX_STR_LEN,
+                           (double)(cd->voxel_size * unit->scale_length),
+                           4,
+                           B_UNIT_LENGTH,
+                           unit,
+                           true);
   strdrawlen = BLI_strlen_utf8(str);
 
   immUnbindProgram();



More information about the Bf-blender-cvs mailing list