diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/bmesh/operators/bmo_bevel.c | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
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
Diffstat (limited to 'source/blender/bmesh/operators/bmo_bevel.c')
-rw-r--r-- | source/blender/bmesh/operators/bmo_bevel.c | 100 |
1 files changed, 58 insertions, 42 deletions
diff --git a/source/blender/bmesh/operators/bmo_bevel.c b/source/blender/bmesh/operators/bmo_bevel.c index 19c377d18a9..33be9559db3 100644 --- a/source/blender/bmesh/operators/bmo_bevel.c +++ b/source/blender/bmesh/operators/bmo_bevel.c @@ -29,52 +29,68 @@ void bmo_bevel_exec(BMesh *bm, BMOperator *op) { - const float offset = BMO_slot_float_get(op->slots_in, "offset"); - const int offset_type = BMO_slot_int_get(op->slots_in, "offset_type"); - const int seg = BMO_slot_int_get(op->slots_in, "segments"); - const bool vonly = BMO_slot_bool_get(op->slots_in, "vertex_only"); - const float profile = BMO_slot_float_get(op->slots_in, "profile"); - const bool clamp_overlap = BMO_slot_bool_get(op->slots_in, "clamp_overlap"); - const int material = BMO_slot_int_get(op->slots_in, "material"); - const bool loop_slide = BMO_slot_bool_get(op->slots_in, "loop_slide"); - const bool mark_seam = BMO_slot_bool_get(op->slots_in, "mark_seam"); - const bool mark_sharp = BMO_slot_bool_get(op->slots_in, "mark_sharp"); - const bool harden_normals = BMO_slot_bool_get(op->slots_in, "harden_normals"); - const int face_strength_mode = BMO_slot_int_get(op->slots_in, "face_strength_mode"); - const int miter_outer = BMO_slot_int_get(op->slots_in, "miter_outer"); - const int miter_inner = BMO_slot_int_get(op->slots_in, "miter_inner"); - const float spread = BMO_slot_float_get(op->slots_in, "spread"); - const float smoothresh = BMO_slot_float_get(op->slots_in, "smoothresh"); + const float offset = BMO_slot_float_get(op->slots_in, "offset"); + const int offset_type = BMO_slot_int_get(op->slots_in, "offset_type"); + const int seg = BMO_slot_int_get(op->slots_in, "segments"); + const bool vonly = BMO_slot_bool_get(op->slots_in, "vertex_only"); + const float profile = BMO_slot_float_get(op->slots_in, "profile"); + const bool clamp_overlap = BMO_slot_bool_get(op->slots_in, "clamp_overlap"); + const int material = BMO_slot_int_get(op->slots_in, "material"); + const bool loop_slide = BMO_slot_bool_get(op->slots_in, "loop_slide"); + const bool mark_seam = BMO_slot_bool_get(op->slots_in, "mark_seam"); + const bool mark_sharp = BMO_slot_bool_get(op->slots_in, "mark_sharp"); + const bool harden_normals = BMO_slot_bool_get(op->slots_in, "harden_normals"); + const int face_strength_mode = BMO_slot_int_get(op->slots_in, "face_strength_mode"); + const int miter_outer = BMO_slot_int_get(op->slots_in, "miter_outer"); + const int miter_inner = BMO_slot_int_get(op->slots_in, "miter_inner"); + const float spread = BMO_slot_float_get(op->slots_in, "spread"); + const float smoothresh = BMO_slot_float_get(op->slots_in, "smoothresh"); - if (offset > 0) { - BMOIter siter; - BMEdge *e; - BMVert *v; + if (offset > 0) { + BMOIter siter; + BMEdge *e; + BMVert *v; - /* first flush 'geom' into flags, this makes it possible to check connected data, - * BM_FACE is cleared so we can put newly created faces into a bmesh slot. */ - BM_mesh_elem_hflag_disable_all(bm, BM_VERT | BM_EDGE | BM_FACE, BM_ELEM_TAG, false); + /* first flush 'geom' into flags, this makes it possible to check connected data, + * BM_FACE is cleared so we can put newly created faces into a bmesh slot. */ + BM_mesh_elem_hflag_disable_all(bm, BM_VERT | BM_EDGE | BM_FACE, BM_ELEM_TAG, false); - BMO_ITER (v, &siter, op->slots_in, "geom", BM_VERT) { - BM_elem_flag_enable(v, BM_ELEM_TAG); - } + BMO_ITER (v, &siter, op->slots_in, "geom", BM_VERT) { + BM_elem_flag_enable(v, BM_ELEM_TAG); + } - BMO_ITER (e, &siter, op->slots_in, "geom", BM_EDGE) { - if (BM_edge_is_manifold(e)) { - BM_elem_flag_enable(e, BM_ELEM_TAG); - /* in case verts were not also included in the geom */ - BM_elem_flag_enable(e->v1, BM_ELEM_TAG); - BM_elem_flag_enable(e->v2, BM_ELEM_TAG); - } - } + BMO_ITER (e, &siter, op->slots_in, "geom", BM_EDGE) { + if (BM_edge_is_manifold(e)) { + BM_elem_flag_enable(e, BM_ELEM_TAG); + /* in case verts were not also included in the geom */ + BM_elem_flag_enable(e->v1, BM_ELEM_TAG); + BM_elem_flag_enable(e->v2, BM_ELEM_TAG); + } + } - BM_mesh_bevel( - bm, offset, offset_type, seg, profile, vonly, false, clamp_overlap, NULL, -1, material, - loop_slide, mark_seam, mark_sharp, harden_normals, face_strength_mode, - miter_outer, miter_inner, spread, smoothresh); + BM_mesh_bevel(bm, + offset, + offset_type, + seg, + profile, + vonly, + false, + clamp_overlap, + NULL, + -1, + material, + loop_slide, + mark_seam, + mark_sharp, + harden_normals, + face_strength_mode, + miter_outer, + miter_inner, + spread, + smoothresh); - BMO_slot_buffer_from_enabled_hflag(bm, op, op->slots_out, "faces.out", BM_FACE, BM_ELEM_TAG); - BMO_slot_buffer_from_enabled_hflag(bm, op, op->slots_out, "edges.out", BM_EDGE, BM_ELEM_TAG); - BMO_slot_buffer_from_enabled_hflag(bm, op, op->slots_out, "verts.out", BM_VERT, BM_ELEM_TAG); - } + BMO_slot_buffer_from_enabled_hflag(bm, op, op->slots_out, "faces.out", BM_FACE, BM_ELEM_TAG); + BMO_slot_buffer_from_enabled_hflag(bm, op, op->slots_out, "edges.out", BM_EDGE, BM_ELEM_TAG); + BMO_slot_buffer_from_enabled_hflag(bm, op, op->slots_out, "verts.out", BM_VERT, BM_ELEM_TAG); + } } |