Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/bmesh/intern/bmesh_iterators_inline.h
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (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/intern/bmesh_iterators_inline.h')
-rw-r--r--source/blender/bmesh/intern/bmesh_iterators_inline.h269
1 files changed, 135 insertions, 134 deletions
diff --git a/source/blender/bmesh/intern/bmesh_iterators_inline.h b/source/blender/bmesh/intern/bmesh_iterators_inline.h
index 30740a1bc90..ed3a9a5be09 100644
--- a/source/blender/bmesh/intern/bmesh_iterators_inline.h
+++ b/source/blender/bmesh/intern/bmesh_iterators_inline.h
@@ -31,13 +31,11 @@
*
* Calls an iterators step function to return the next element.
*/
-ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1)
-BLI_INLINE void *BM_iter_step(BMIter *iter)
+ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1) BLI_INLINE void *BM_iter_step(BMIter *iter)
{
- return iter->step(iter);
+ return iter->step(iter);
}
-
/**
* \brief Iterator Init
*
@@ -48,112 +46,112 @@ BLI_INLINE void *BM_iter_step(BMIter *iter)
ATTR_NONNULL(1)
BLI_INLINE bool BM_iter_init(BMIter *iter, BMesh *bm, const char itype, void *data)
{
- /* int argtype; */
- iter->itype = itype;
+ /* int argtype; */
+ iter->itype = itype;
- /* inlining optimizes out this switch when called with the defined type */
- switch ((BMIterType)itype) {
- case BM_VERTS_OF_MESH:
- BLI_assert(bm != NULL);
- BLI_assert(data == NULL);
- iter->begin = (BMIter__begin_cb)bmiter__elem_of_mesh_begin;
- iter->step = (BMIter__step_cb)bmiter__elem_of_mesh_step;
- iter->data.elem_of_mesh.pooliter.pool = bm->vpool;
- break;
- case BM_EDGES_OF_MESH:
- BLI_assert(bm != NULL);
- BLI_assert(data == NULL);
- iter->begin = (BMIter__begin_cb)bmiter__elem_of_mesh_begin;
- iter->step = (BMIter__step_cb)bmiter__elem_of_mesh_step;
- iter->data.elem_of_mesh.pooliter.pool = bm->epool;
- break;
- case BM_FACES_OF_MESH:
- BLI_assert(bm != NULL);
- BLI_assert(data == NULL);
- iter->begin = (BMIter__begin_cb)bmiter__elem_of_mesh_begin;
- iter->step = (BMIter__step_cb)bmiter__elem_of_mesh_step;
- iter->data.elem_of_mesh.pooliter.pool = bm->fpool;
- break;
- case BM_EDGES_OF_VERT:
- BLI_assert(data != NULL);
- BLI_assert(((BMElem *)data)->head.htype == BM_VERT);
- iter->begin = (BMIter__begin_cb)bmiter__edge_of_vert_begin;
- iter->step = (BMIter__step_cb)bmiter__edge_of_vert_step;
- iter->data.edge_of_vert.vdata = (BMVert *)data;
- break;
- case BM_FACES_OF_VERT:
- BLI_assert(data != NULL);
- BLI_assert(((BMElem *)data)->head.htype == BM_VERT);
- iter->begin = (BMIter__begin_cb)bmiter__face_of_vert_begin;
- iter->step = (BMIter__step_cb)bmiter__face_of_vert_step;
- iter->data.face_of_vert.vdata = (BMVert *)data;
- break;
- case BM_LOOPS_OF_VERT:
- BLI_assert(data != NULL);
- BLI_assert(((BMElem *)data)->head.htype == BM_VERT);
- iter->begin = (BMIter__begin_cb)bmiter__loop_of_vert_begin;
- iter->step = (BMIter__step_cb)bmiter__loop_of_vert_step;
- iter->data.loop_of_vert.vdata = (BMVert *)data;
- break;
- case BM_VERTS_OF_EDGE:
- BLI_assert(data != NULL);
- BLI_assert(((BMElem *)data)->head.htype == BM_EDGE);
- iter->begin = (BMIter__begin_cb)bmiter__vert_of_edge_begin;
- iter->step = (BMIter__step_cb)bmiter__vert_of_edge_step;
- iter->data.vert_of_edge.edata = (BMEdge *)data;
- break;
- case BM_FACES_OF_EDGE:
- BLI_assert(data != NULL);
- BLI_assert(((BMElem *)data)->head.htype == BM_EDGE);
- iter->begin = (BMIter__begin_cb)bmiter__face_of_edge_begin;
- iter->step = (BMIter__step_cb)bmiter__face_of_edge_step;
- iter->data.face_of_edge.edata = (BMEdge *)data;
- break;
- case BM_VERTS_OF_FACE:
- BLI_assert(data != NULL);
- BLI_assert(((BMElem *)data)->head.htype == BM_FACE);
- iter->begin = (BMIter__begin_cb)bmiter__vert_of_face_begin;
- iter->step = (BMIter__step_cb)bmiter__vert_of_face_step;
- iter->data.vert_of_face.pdata = (BMFace *)data;
- break;
- case BM_EDGES_OF_FACE:
- BLI_assert(data != NULL);
- BLI_assert(((BMElem *)data)->head.htype == BM_FACE);
- iter->begin = (BMIter__begin_cb)bmiter__edge_of_face_begin;
- iter->step = (BMIter__step_cb)bmiter__edge_of_face_step;
- iter->data.edge_of_face.pdata = (BMFace *)data;
- break;
- case BM_LOOPS_OF_FACE:
- BLI_assert(data != NULL);
- BLI_assert(((BMElem *)data)->head.htype == BM_FACE);
- iter->begin = (BMIter__begin_cb)bmiter__loop_of_face_begin;
- iter->step = (BMIter__step_cb)bmiter__loop_of_face_step;
- iter->data.loop_of_face.pdata = (BMFace *)data;
- break;
- case BM_LOOPS_OF_LOOP:
- BLI_assert(data != NULL);
- BLI_assert(((BMElem *)data)->head.htype == BM_LOOP);
- iter->begin = (BMIter__begin_cb)bmiter__loop_of_loop_begin;
- iter->step = (BMIter__step_cb)bmiter__loop_of_loop_step;
- iter->data.loop_of_loop.ldata = (BMLoop *)data;
- break;
- case BM_LOOPS_OF_EDGE:
- BLI_assert(data != NULL);
- BLI_assert(((BMElem *)data)->head.htype == BM_EDGE);
- iter->begin = (BMIter__begin_cb)bmiter__loop_of_edge_begin;
- iter->step = (BMIter__step_cb)bmiter__loop_of_edge_step;
- iter->data.loop_of_edge.edata = (BMEdge *)data;
- break;
- default:
- /* should never happen */
- BLI_assert(0);
- return false;
- break;
- }
+ /* inlining optimizes out this switch when called with the defined type */
+ switch ((BMIterType)itype) {
+ case BM_VERTS_OF_MESH:
+ BLI_assert(bm != NULL);
+ BLI_assert(data == NULL);
+ iter->begin = (BMIter__begin_cb)bmiter__elem_of_mesh_begin;
+ iter->step = (BMIter__step_cb)bmiter__elem_of_mesh_step;
+ iter->data.elem_of_mesh.pooliter.pool = bm->vpool;
+ break;
+ case BM_EDGES_OF_MESH:
+ BLI_assert(bm != NULL);
+ BLI_assert(data == NULL);
+ iter->begin = (BMIter__begin_cb)bmiter__elem_of_mesh_begin;
+ iter->step = (BMIter__step_cb)bmiter__elem_of_mesh_step;
+ iter->data.elem_of_mesh.pooliter.pool = bm->epool;
+ break;
+ case BM_FACES_OF_MESH:
+ BLI_assert(bm != NULL);
+ BLI_assert(data == NULL);
+ iter->begin = (BMIter__begin_cb)bmiter__elem_of_mesh_begin;
+ iter->step = (BMIter__step_cb)bmiter__elem_of_mesh_step;
+ iter->data.elem_of_mesh.pooliter.pool = bm->fpool;
+ break;
+ case BM_EDGES_OF_VERT:
+ BLI_assert(data != NULL);
+ BLI_assert(((BMElem *)data)->head.htype == BM_VERT);
+ iter->begin = (BMIter__begin_cb)bmiter__edge_of_vert_begin;
+ iter->step = (BMIter__step_cb)bmiter__edge_of_vert_step;
+ iter->data.edge_of_vert.vdata = (BMVert *)data;
+ break;
+ case BM_FACES_OF_VERT:
+ BLI_assert(data != NULL);
+ BLI_assert(((BMElem *)data)->head.htype == BM_VERT);
+ iter->begin = (BMIter__begin_cb)bmiter__face_of_vert_begin;
+ iter->step = (BMIter__step_cb)bmiter__face_of_vert_step;
+ iter->data.face_of_vert.vdata = (BMVert *)data;
+ break;
+ case BM_LOOPS_OF_VERT:
+ BLI_assert(data != NULL);
+ BLI_assert(((BMElem *)data)->head.htype == BM_VERT);
+ iter->begin = (BMIter__begin_cb)bmiter__loop_of_vert_begin;
+ iter->step = (BMIter__step_cb)bmiter__loop_of_vert_step;
+ iter->data.loop_of_vert.vdata = (BMVert *)data;
+ break;
+ case BM_VERTS_OF_EDGE:
+ BLI_assert(data != NULL);
+ BLI_assert(((BMElem *)data)->head.htype == BM_EDGE);
+ iter->begin = (BMIter__begin_cb)bmiter__vert_of_edge_begin;
+ iter->step = (BMIter__step_cb)bmiter__vert_of_edge_step;
+ iter->data.vert_of_edge.edata = (BMEdge *)data;
+ break;
+ case BM_FACES_OF_EDGE:
+ BLI_assert(data != NULL);
+ BLI_assert(((BMElem *)data)->head.htype == BM_EDGE);
+ iter->begin = (BMIter__begin_cb)bmiter__face_of_edge_begin;
+ iter->step = (BMIter__step_cb)bmiter__face_of_edge_step;
+ iter->data.face_of_edge.edata = (BMEdge *)data;
+ break;
+ case BM_VERTS_OF_FACE:
+ BLI_assert(data != NULL);
+ BLI_assert(((BMElem *)data)->head.htype == BM_FACE);
+ iter->begin = (BMIter__begin_cb)bmiter__vert_of_face_begin;
+ iter->step = (BMIter__step_cb)bmiter__vert_of_face_step;
+ iter->data.vert_of_face.pdata = (BMFace *)data;
+ break;
+ case BM_EDGES_OF_FACE:
+ BLI_assert(data != NULL);
+ BLI_assert(((BMElem *)data)->head.htype == BM_FACE);
+ iter->begin = (BMIter__begin_cb)bmiter__edge_of_face_begin;
+ iter->step = (BMIter__step_cb)bmiter__edge_of_face_step;
+ iter->data.edge_of_face.pdata = (BMFace *)data;
+ break;
+ case BM_LOOPS_OF_FACE:
+ BLI_assert(data != NULL);
+ BLI_assert(((BMElem *)data)->head.htype == BM_FACE);
+ iter->begin = (BMIter__begin_cb)bmiter__loop_of_face_begin;
+ iter->step = (BMIter__step_cb)bmiter__loop_of_face_step;
+ iter->data.loop_of_face.pdata = (BMFace *)data;
+ break;
+ case BM_LOOPS_OF_LOOP:
+ BLI_assert(data != NULL);
+ BLI_assert(((BMElem *)data)->head.htype == BM_LOOP);
+ iter->begin = (BMIter__begin_cb)bmiter__loop_of_loop_begin;
+ iter->step = (BMIter__step_cb)bmiter__loop_of_loop_step;
+ iter->data.loop_of_loop.ldata = (BMLoop *)data;
+ break;
+ case BM_LOOPS_OF_EDGE:
+ BLI_assert(data != NULL);
+ BLI_assert(((BMElem *)data)->head.htype == BM_EDGE);
+ iter->begin = (BMIter__begin_cb)bmiter__loop_of_edge_begin;
+ iter->step = (BMIter__step_cb)bmiter__loop_of_edge_step;
+ iter->data.loop_of_edge.edata = (BMEdge *)data;
+ break;
+ default:
+ /* should never happen */
+ BLI_assert(0);
+ return false;
+ break;
+ }
- iter->begin(iter);
+ iter->begin(iter);
- return true;
+ return true;
}
/**
@@ -164,15 +162,15 @@ BLI_INLINE bool BM_iter_init(BMIter *iter, BMesh *bm, const char itype, void *da
* upon its type and then calls BMeshIter_step()
* to return the first element of the iterator.
*/
-ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1)
-BLI_INLINE void *BM_iter_new(BMIter *iter, BMesh *bm, const char itype, void *data)
+ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1) BLI_INLINE
+ void *BM_iter_new(BMIter *iter, BMesh *bm, const char itype, void *data)
{
- if (LIKELY(BM_iter_init(iter, bm, itype, data))) {
- return BM_iter_step(iter);
- }
- else {
- return NULL;
- }
+ if (LIKELY(BM_iter_init(iter, bm, itype, data))) {
+ return BM_iter_step(iter);
+ }
+ else {
+ return NULL;
+ }
}
/**
@@ -186,27 +184,30 @@ BLI_INLINE void *BM_iter_new(BMIter *iter, BMesh *bm, const char itype, void *da
#ifdef __BLI_TASK_H__
ATTR_NONNULL(1)
-BLI_INLINE void BM_iter_parallel(
- BMesh *bm, const char itype, TaskParallelMempoolFunc func, void *userdata, const bool use_threading)
+BLI_INLINE void BM_iter_parallel(BMesh *bm,
+ const char itype,
+ TaskParallelMempoolFunc func,
+ void *userdata,
+ const bool use_threading)
{
- /* inlining optimizes out this switch when called with the defined type */
- switch ((BMIterType)itype) {
- case BM_VERTS_OF_MESH:
- BLI_task_parallel_mempool(bm->vpool, userdata, func, use_threading);
- break;
- case BM_EDGES_OF_MESH:
- BLI_task_parallel_mempool(bm->epool, userdata, func, use_threading);
- break;
- case BM_FACES_OF_MESH:
- BLI_task_parallel_mempool(bm->fpool, userdata, func, use_threading);
- break;
- default:
- /* should never happen */
- BLI_assert(0);
- break;
- }
+ /* inlining optimizes out this switch when called with the defined type */
+ switch ((BMIterType)itype) {
+ case BM_VERTS_OF_MESH:
+ BLI_task_parallel_mempool(bm->vpool, userdata, func, use_threading);
+ break;
+ case BM_EDGES_OF_MESH:
+ BLI_task_parallel_mempool(bm->epool, userdata, func, use_threading);
+ break;
+ case BM_FACES_OF_MESH:
+ BLI_task_parallel_mempool(bm->fpool, userdata, func, use_threading);
+ break;
+ default:
+ /* should never happen */
+ BLI_assert(0);
+ break;
+ }
}
-#endif /* __BLI_TASK_H__ */
+#endif /* __BLI_TASK_H__ */
#endif /* __BMESH_ITERATORS_INLINE_H__ */