diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-03-15 00:53:22 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-15 01:54:30 +0300 |
commit | 35b78d9807c49ba37e038eda85c672c72dee0247 (patch) | |
tree | a081042c85b98d0ac9116c0c4ba99ded6ae5de84 /source/blender/bmesh/intern | |
parent | 395a0acdb88338b9790ecefd142f4010df6b955d (diff) |
Cleanup: indentation, wrapping
Mostly functions wrapping args, not confirming to our style guide.
Diffstat (limited to 'source/blender/bmesh/intern')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_log.c | 4 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh.c | 16 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_opdefines.c | 6 |
3 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/bmesh/intern/bmesh_log.c b/source/blender/bmesh/intern/bmesh_log.c index ec7c2237edb..77dd6aa76ec 100644 --- a/source/blender/bmesh/intern/bmesh_log.c +++ b/source/blender/bmesh/intern/bmesh_log.c @@ -1126,10 +1126,10 @@ void bm_log_print(const BMLog *log, const char *description) printf("%s:\n", description); printf(" % 2d: [ initial ]%s\n", 0, - (!log->current_entry) ? current : ""); + (!log->current_entry) ? current : ""); for (entry = log->entries.first, i = 1; entry; entry = entry->next, i++) { printf(" % 2d: [%p]%s\n", i, entry, - (entry == log->current_entry) ? current : ""); + (entry == log->current_entry) ? current : ""); } } #endif diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c index 1e2612dd843..a1f2281e6ef 100644 --- a/source/blender/bmesh/intern/bmesh_mesh.c +++ b/source/blender/bmesh/intern/bmesh_mesh.c @@ -1074,7 +1074,7 @@ void BM_lnorspacearr_store(BMesh *bm, float(*r_lnors)[3]) int cd_loop_clnors_offset = CustomData_get_offset(&bm->ldata, CD_CUSTOMLOOPNORMAL); BM_loops_calc_normal_vcos( - bm, NULL, NULL, NULL, true, M_PI, r_lnors, bm->lnor_spacearr, NULL, cd_loop_clnors_offset, false); + bm, NULL, NULL, NULL, true, M_PI, r_lnors, bm->lnor_spacearr, NULL, cd_loop_clnors_offset, false); bm->spacearr_dirty &= ~(BM_SPACEARR_DIRTY | BM_SPACEARR_DIRTY_ALL); } @@ -1188,7 +1188,7 @@ void BM_lnorspace_rebuild(BMesh *bm, bool preserve_clnor) BKE_lnor_spacearr_clear(bm->lnor_spacearr); } BM_loops_calc_normal_vcos( - bm, NULL, NULL, NULL, true, M_PI, r_lnors, bm->lnor_spacearr, NULL, cd_loop_clnors_offset, true); + bm, NULL, NULL, NULL, true, M_PI, r_lnors, bm->lnor_spacearr, NULL, cd_loop_clnors_offset, true); MEM_freeN(r_lnors); BM_ITER_MESH(f, &fiter, bm, BM_FACES_OF_MESH) { @@ -1352,17 +1352,17 @@ static int bm_loop_normal_mark_indiv(BMesh *bm, BLI_bitmap *loops) while ((ese_prev = ese_prev->prev)) { if (ese_prev->htype == BM_VERT) { bm_loop_normal_mark_indiv_do_loop( - BM_face_vert_share_loop((BMFace *)ese->ele, (BMVert *)ese_prev->ele), - loops, bm->lnor_spacearr, &totloopsel); + BM_face_vert_share_loop((BMFace *)ese->ele, (BMVert *)ese_prev->ele), + loops, bm->lnor_spacearr, &totloopsel); } else if (ese_prev->htype == BM_EDGE) { bm_loop_normal_mark_indiv_do_loop( - BM_face_vert_share_loop((BMFace *)ese->ele, ((BMEdge *)ese_prev->ele)->v1), - loops, bm->lnor_spacearr, &totloopsel); + BM_face_vert_share_loop((BMFace *)ese->ele, ((BMEdge *)ese_prev->ele)->v1), + loops, bm->lnor_spacearr, &totloopsel); bm_loop_normal_mark_indiv_do_loop( - BM_face_vert_share_loop((BMFace *)ese->ele, ((BMEdge *)ese_prev->ele)->v2), - loops, bm->lnor_spacearr, &totloopsel); + BM_face_vert_share_loop((BMFace *)ese->ele, ((BMEdge *)ese_prev->ele)->v2), + loops, bm->lnor_spacearr, &totloopsel); } } } diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c index 35543aa23ce..0ed1338e62f 100644 --- a/source/blender/bmesh/intern/bmesh_opdefines.c +++ b/source/blender/bmesh/intern/bmesh_opdefines.c @@ -1765,11 +1765,11 @@ static BMOpDefine bmo_bevel_def = { {"mark_sharp", BMO_OP_SLOT_BOOL}, /* extend edge data to allow sharp edges to run across bevels */ {"harden_normals", BMO_OP_SLOT_BOOL}, /* harden normals */ {"face_strength_mode", BMO_OP_SLOT_INT, {(int)BMO_OP_SLOT_SUBTYPE_INT_ENUM}, - bmo_enum_bevel_face_strength_type}, /* whether to set face strength, and which faces to set if so */ + bmo_enum_bevel_face_strength_type}, /* whether to set face strength, and which faces to set if so */ {"miter_outer", BMO_OP_SLOT_INT, {(int)BMO_OP_SLOT_SUBTYPE_INT_ENUM}, - bmo_enum_bevel_miter_type}, /* outer miter kind */ + bmo_enum_bevel_miter_type}, /* outer miter kind */ {"miter_inner", BMO_OP_SLOT_INT, {(int)BMO_OP_SLOT_SUBTYPE_INT_ENUM}, - bmo_enum_bevel_miter_type}, /* outer miter kind */ + bmo_enum_bevel_miter_type}, /* outer miter kind */ {"spread", BMO_OP_SLOT_FLT}, /* amount to offset beveled edge */ {"smoothresh", BMO_OP_SLOT_FLT}, /* for passing mesh's smoothresh, used in hardening */ {{'\0'}}, |