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

Cleanup: clang-format

This commit is contained in:
Campbell Barton 2022-04-24 13:37:01 +10:00
parent 99fff90eab
commit a6504aa64b
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/bmesh/bmesh_class.h
View File

@ -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); \

1
source/blender/draw/intern/draw_hair_private.h
View File

@ -75,7 +75,6 @@ typedef struct ParticleHairCache {
int point_len;
} ParticleHairCache;
/**
* Ensure all textures and buffers needed for GPU accelerated drawing.
*/

8
source/blender/editors/object/object_remesh.cc
View File

@ -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();