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/blenkernel/intern/editmesh_cache.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/blenkernel/intern/editmesh_cache.c')
-rw-r--r-- | source/blender/blenkernel/intern/editmesh_cache.c | 125 |
1 files changed, 62 insertions, 63 deletions
diff --git a/source/blender/blenkernel/intern/editmesh_cache.c b/source/blender/blenkernel/intern/editmesh_cache.c index 0c890ad5741..8d3f1e84bcd 100644 --- a/source/blender/blenkernel/intern/editmesh_cache.c +++ b/source/blender/blenkernel/intern/editmesh_cache.c @@ -24,92 +24,91 @@ #include "DNA_mesh_types.h" - #include "BKE_editmesh.h" -#include "BKE_editmesh_cache.h" /* own include */ +#include "BKE_editmesh_cache.h" /* own include */ void BKE_editmesh_cache_ensure_poly_normals(BMEditMesh *em, EditMeshData *emd) { - if (!(emd->vertexCos && (emd->polyNos == NULL))) { - return; - } + if (!(emd->vertexCos && (emd->polyNos == NULL))) { + return; + } - BMesh *bm = em->bm; - const float (*vertexCos)[3]; - float (*polyNos)[3]; + BMesh *bm = em->bm; + const float(*vertexCos)[3]; + float(*polyNos)[3]; - BMFace *efa; - BMIter fiter; - int i; + BMFace *efa; + BMIter fiter; + int i; - BM_mesh_elem_index_ensure(bm, BM_VERT); + BM_mesh_elem_index_ensure(bm, BM_VERT); - polyNos = MEM_mallocN(sizeof(*polyNos) * bm->totface, __func__); + polyNos = MEM_mallocN(sizeof(*polyNos) * bm->totface, __func__); - vertexCos = emd->vertexCos; + vertexCos = emd->vertexCos; - BM_ITER_MESH_INDEX (efa, &fiter, bm, BM_FACES_OF_MESH, i) { - BM_elem_index_set(efa, i); /* set_inline */ - BM_face_calc_normal_vcos(bm, efa, polyNos[i], vertexCos); - } - bm->elem_index_dirty &= ~BM_FACE; + BM_ITER_MESH_INDEX (efa, &fiter, bm, BM_FACES_OF_MESH, i) { + BM_elem_index_set(efa, i); /* set_inline */ + BM_face_calc_normal_vcos(bm, efa, polyNos[i], vertexCos); + } + bm->elem_index_dirty &= ~BM_FACE; - emd->polyNos = (const float (*)[3])polyNos; + emd->polyNos = (const float(*)[3])polyNos; } void BKE_editmesh_cache_ensure_vert_normals(BMEditMesh *em, EditMeshData *emd) { - if (!(emd->vertexCos && (emd->vertexNos == NULL))) { - return; - } + if (!(emd->vertexCos && (emd->vertexNos == NULL))) { + return; + } - BMesh *bm = em->bm; - const float (*vertexCos)[3], (*polyNos)[3]; - float (*vertexNos)[3]; + BMesh *bm = em->bm; + const float(*vertexCos)[3], (*polyNos)[3]; + float(*vertexNos)[3]; - /* calculate vertex normals from poly normals */ - BKE_editmesh_cache_ensure_poly_normals(em, emd); + /* calculate vertex normals from poly normals */ + BKE_editmesh_cache_ensure_poly_normals(em, emd); - BM_mesh_elem_index_ensure(bm, BM_FACE); + BM_mesh_elem_index_ensure(bm, BM_FACE); - polyNos = emd->polyNos; - vertexCos = emd->vertexCos; - vertexNos = MEM_callocN(sizeof(*vertexNos) * bm->totvert, __func__); + polyNos = emd->polyNos; + vertexCos = emd->vertexCos; + vertexNos = MEM_callocN(sizeof(*vertexNos) * bm->totvert, __func__); - BM_verts_calc_normal_vcos(bm, polyNos, vertexCos, vertexNos); + BM_verts_calc_normal_vcos(bm, polyNos, vertexCos, vertexNos); - emd->vertexNos = (const float (*)[3])vertexNos; + emd->vertexNos = (const float(*)[3])vertexNos; } void BKE_editmesh_cache_ensure_poly_centers(BMEditMesh *em, EditMeshData *emd) { - if (emd->polyCos != NULL) { - return; - } - BMesh *bm = em->bm; - float (*polyCos)[3]; - - BMFace *efa; - BMIter fiter; - int i; - - polyCos = MEM_mallocN(sizeof(*polyCos) * bm->totface, __func__); - - if (emd->vertexCos) { - const float (*vertexCos)[3]; - vertexCos = emd->vertexCos; - - BM_mesh_elem_index_ensure(bm, BM_VERT); - - BM_ITER_MESH_INDEX (efa, &fiter, bm, BM_FACES_OF_MESH, i) { - BM_face_calc_center_median_vcos(bm, efa, polyCos[i], vertexCos); - } - } - else { - BM_ITER_MESH_INDEX (efa, &fiter, bm, BM_FACES_OF_MESH, i) { - BM_face_calc_center_median(efa, polyCos[i]); - } - } - - emd->polyCos = (const float (*)[3])polyCos; + if (emd->polyCos != NULL) { + return; + } + BMesh *bm = em->bm; + float(*polyCos)[3]; + + BMFace *efa; + BMIter fiter; + int i; + + polyCos = MEM_mallocN(sizeof(*polyCos) * bm->totface, __func__); + + if (emd->vertexCos) { + const float(*vertexCos)[3]; + vertexCos = emd->vertexCos; + + BM_mesh_elem_index_ensure(bm, BM_VERT); + + BM_ITER_MESH_INDEX (efa, &fiter, bm, BM_FACES_OF_MESH, i) { + BM_face_calc_center_median_vcos(bm, efa, polyCos[i], vertexCos); + } + } + else { + BM_ITER_MESH_INDEX (efa, &fiter, bm, BM_FACES_OF_MESH, i) { + BM_face_calc_center_median(efa, polyCos[i]); + } + } + + emd->polyCos = (const float(*)[3])polyCos; } |