From e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 06:17:24 +0200 Subject: ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat --- source/blender/bmesh/intern/bmesh_mesh_conv.h | 46 +++++++++++++-------------- 1 file changed, 22 insertions(+), 24 deletions(-) (limited to 'source/blender/bmesh/intern/bmesh_mesh_conv.h') diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.h b/source/blender/bmesh/intern/bmesh_mesh_conv.h index 30a1e8bffd5..f0302764a5f 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_conv.h +++ b/source/blender/bmesh/intern/bmesh_mesh_conv.h @@ -33,33 +33,31 @@ void BM_mesh_cd_flag_apply(BMesh *bm, const char cd_flag); char BM_mesh_cd_flag_from_bmesh(BMesh *bm); struct BMeshFromMeshParams { - uint calc_face_normal : 1; - /* add a vertex CD_SHAPE_KEYINDEX layer */ - uint add_key_index : 1; - /* set vertex coordinates from the shapekey */ - uint use_shapekey : 1; - /* define the active shape key (index + 1) */ - int active_shapekey; - struct CustomData_MeshMasks cd_mask_extra; + uint calc_face_normal : 1; + /* add a vertex CD_SHAPE_KEYINDEX layer */ + uint add_key_index : 1; + /* set vertex coordinates from the shapekey */ + uint use_shapekey : 1; + /* define the active shape key (index + 1) */ + int active_shapekey; + struct CustomData_MeshMasks cd_mask_extra; }; -void BM_mesh_bm_from_me( - BMesh *bm, const struct Mesh *me, - const struct BMeshFromMeshParams *params) -ATTR_NONNULL(1, 3); +void BM_mesh_bm_from_me(BMesh *bm, const struct Mesh *me, const struct BMeshFromMeshParams *params) + ATTR_NONNULL(1, 3); struct BMeshToMeshParams { - /** Update object hook indices & vertex parents. */ - uint calc_object_remap : 1; - struct CustomData_MeshMasks cd_mask_extra; + /** Update object hook indices & vertex parents. */ + uint calc_object_remap : 1; + struct CustomData_MeshMasks cd_mask_extra; }; -void BM_mesh_bm_to_me( - struct Main *bmain, BMesh *bm, struct Mesh *me, - const struct BMeshToMeshParams *params) -ATTR_NONNULL(2, 3, 4); - -void BM_mesh_bm_to_me_for_eval( - BMesh *bm, struct Mesh *me, const struct CustomData_MeshMasks *cd_mask_extra) -ATTR_NONNULL(1, 2); - +void BM_mesh_bm_to_me(struct Main *bmain, + BMesh *bm, + struct Mesh *me, + const struct BMeshToMeshParams *params) ATTR_NONNULL(2, 3, 4); + +void BM_mesh_bm_to_me_for_eval(BMesh *bm, + struct Mesh *me, + const struct CustomData_MeshMasks *cd_mask_extra) + ATTR_NONNULL(1, 2); #endif /* __BMESH_MESH_CONV_H__ */ -- cgit v1.2.3