diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-04-19 16:45:56 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-19 16:45:56 +0400 |
| commit | 3ef79439100a910f2f23b8ad1d3584984d289ee9 (patch) | |
| tree | c962832271925fe410f479dedddda848a01eb5fc /source/blender/bmesh/intern/bmesh_iterators.h | |
| parent | 7cadd242d3eb7a29f19efe1d1462dbe12998c196 (diff) | |
code cleanup: first step to replace BM_ITER BM_ITER_INDEX macros.
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_iterators.h')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_iterators.h | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/source/blender/bmesh/intern/bmesh_iterators.h b/source/blender/bmesh/intern/bmesh_iterators.h index d3566d8aead..65da25015ee 100644 --- a/source/blender/bmesh/intern/bmesh_iterators.h +++ b/source/blender/bmesh/intern/bmesh_iterators.h @@ -83,13 +83,24 @@ typedef enum BMIterType { extern const char bm_iter_itype_htype_map[BM_ITYPE_MAX]; -#define BM_ITER(ele, iter, bm, itype, data) \ - ele = BM_iter_new(iter, bm, itype, data); \ - for ( ; ele; ele = BM_iter_step(iter)) +#define BM_ITER(ele, iter, bm, itype, data) \ + for (ele = BM_iter_new(iter, bm, itype, data); ele; ele = BM_iter_step(iter)) + +#define BM_ITER_MESH(ele, iter, bm, itype) \ + for (ele = BM_iter_new(iter, bm, itype, NULL); ele; ele = BM_iter_step(iter)) + +#define BM_ITER_MESH_INDEX(ele, iter, bm, itype, indexvar) \ + for (ele = BM_iter_new(iter, bm, itype, NULL), indexvar = 0; ele; ele = BM_iter_step(iter), (indexvar)++) + +#define BM_ITER_ELEM(ele, iter, data, itype) \ + for (ele = BM_iter_new(iter, NULL, itype, data); ele; ele = BM_iter_step(iter)) + +#define BM_ITER_ELEM_INDEX(ele, iter, data, itype) \ + for (ele = BM_iter_new(iter, NULL, itype, data), indexvar = 0; ele; ele = BM_iter_step(iter), (indexvar)++) + +#define BM_ITER_INDEX(ele, iter, bm, itype, data, indexvar) \ + for (ele = BM_iter_new(iter, bm, itype, data), indexvar = 0; ele; ele = BM_iter_step(iter), (indexvar)++) -#define BM_ITER_INDEX(ele, iter, bm, itype, data, indexvar) \ - ele = BM_iter_new(iter, bm, itype, data); \ - for (indexvar = 0; ele; indexvar++, ele = BM_iter_step(iter)) /* Iterator Structure */ typedef struct BMIter { |