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_mesh_conv.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_mesh_conv.c')
-rw-r--r-- | source/blender/bmesh/operators/bmo_mesh_conv.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/source/blender/bmesh/operators/bmo_mesh_conv.c b/source/blender/bmesh/operators/bmo_mesh_conv.c index 5db189a6748..2c76074ad79 100644 --- a/source/blender/bmesh/operators/bmo_mesh_conv.c +++ b/source/blender/bmesh/operators/bmo_mesh_conv.c @@ -22,7 +22,6 @@ * into a Bmesh, and back again. */ - #include "DNA_mesh_types.h" #include "DNA_object_types.h" #include "DNA_key_types.h" @@ -36,39 +35,40 @@ void bmo_mesh_to_bmesh_exec(BMesh *bm, BMOperator *op) { - Object *ob = BMO_slot_ptr_get(op->slots_in, "object"); - Mesh *me = BMO_slot_ptr_get(op->slots_in, "mesh"); - bool set_key = BMO_slot_bool_get(op->slots_in, "use_shapekey"); + Object *ob = BMO_slot_ptr_get(op->slots_in, "object"); + Mesh *me = BMO_slot_ptr_get(op->slots_in, "mesh"); + bool set_key = BMO_slot_bool_get(op->slots_in, "use_shapekey"); - BM_mesh_bm_from_me( - bm, me, (&(struct BMeshFromMeshParams){ - .use_shapekey = set_key, .active_shapekey = ob->shapenr, - })); + BM_mesh_bm_from_me(bm, + me, + (&(struct BMeshFromMeshParams){ + .use_shapekey = set_key, + .active_shapekey = ob->shapenr, + })); - if (me->key && ob->shapenr > me->key->totkey) { - ob->shapenr = me->key->totkey - 1; - } + if (me->key && ob->shapenr > me->key->totkey) { + ob->shapenr = me->key->totkey - 1; + } } void bmo_object_load_bmesh_exec(BMesh *bm, BMOperator *op) { - Object *ob = BMO_slot_ptr_get(op->slots_in, "object"); - /* Scene *scene = BMO_slot_ptr_get(op, "scene"); */ - Mesh *me = ob->data; + Object *ob = BMO_slot_ptr_get(op->slots_in, "object"); + /* Scene *scene = BMO_slot_ptr_get(op, "scene"); */ + Mesh *me = ob->data; - BMO_op_callf(bm, op->flag, - "bmesh_to_mesh mesh=%p object=%p", - me, ob); + BMO_op_callf(bm, op->flag, "bmesh_to_mesh mesh=%p object=%p", me, ob); } void bmo_bmesh_to_mesh_exec(BMesh *bm, BMOperator *op) { - Mesh *me = BMO_slot_ptr_get(op->slots_in, "mesh"); - /* Object *ob = BMO_slot_ptr_get(op, "object"); */ + Mesh *me = BMO_slot_ptr_get(op->slots_in, "mesh"); + /* Object *ob = BMO_slot_ptr_get(op, "object"); */ - BM_mesh_bm_to_me( - G.main, bm, me, - (&(struct BMeshToMeshParams){ - .calc_object_remap = true, - })); + BM_mesh_bm_to_me(G.main, + bm, + me, + (&(struct BMeshToMeshParams){ + .calc_object_remap = true, + })); } |