diff options
Diffstat (limited to 'source/blender/bmesh/intern')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_core.c | 4 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_iterators.h | 2 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_polygon.c | 7 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_walkers.h | 30 |
4 files changed, 23 insertions, 20 deletions
diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c index eeffdc86a16..dd5edcae583 100644 --- a/source/blender/bmesh/intern/bmesh_core.c +++ b/source/blender/bmesh/intern/bmesh_core.c @@ -377,8 +377,8 @@ int bmesh_elem_check(BMesh *UNUSED(bm), void *element, const char htype) if (l->f->len <= 0) err |= (1 << 13); - /* validate boundary loop--invalid for hole loops, of course, - * but we won't be allowing those for a while ye */ + /* validate boundary loop -- invalid for hole loops, of course, + * but we won't be allowing those for a while yet */ l2 = l; i = 0; do { diff --git a/source/blender/bmesh/intern/bmesh_iterators.h b/source/blender/bmesh/intern/bmesh_iterators.h index 24653fc0b73..7b13d2de723 100644 --- a/source/blender/bmesh/intern/bmesh_iterators.h +++ b/source/blender/bmesh/intern/bmesh_iterators.h @@ -37,7 +37,7 @@ * the iterators provided in this file instead * of inspecting the structure directly. * -*/ + */ #include "BLI_mempool.h" diff --git a/source/blender/bmesh/intern/bmesh_polygon.c b/source/blender/bmesh/intern/bmesh_polygon.c index 15a5a7d71b0..67bdec16a05 100644 --- a/source/blender/bmesh/intern/bmesh_polygon.c +++ b/source/blender/bmesh/intern/bmesh_polygon.c @@ -825,14 +825,17 @@ void BM_face_triangulate(BMesh *bm, BMFace *f, float (*projectverts)[3], if (newfaces) newfaces[nf_i++] = f; - /* l = f->loopbase; +#if 0 + l = f->loopbase; do { if (l->v == v) { f->loopbase = l; break; } l = l->next; - } while (l != f->loopbase); */ + } while (l != f->loopbase); +#endif + } } diff --git a/source/blender/bmesh/intern/bmesh_walkers.h b/source/blender/bmesh/intern/bmesh_walkers.h index 4c8830e61e3..9ea9e332c5f 100644 --- a/source/blender/bmesh/intern/bmesh_walkers.h +++ b/source/blender/bmesh/intern/bmesh_walkers.h @@ -30,8 +30,8 @@ #include "BLI_ghash.h" /* - NOTE: do NOT modify topology while walking a mesh! -*/ + * NOTE: do NOT modify topology while walking a mesh! + */ typedef enum { BMW_DEPTH_FIRST, @@ -85,19 +85,19 @@ void *BMW_walk(BMWalker *walker); void BMW_reset(BMWalker *walker); /* -example of usage, walking over an island of tool flagged faces: - -BMWalker walker; -BMFace *f; - -BMW_init(&walker, bm, BMW_ISLAND, SOME_OP_FLAG); -f = BMW_begin(&walker, some_start_face); -for (; f; f = BMW_step(&walker)) -{ - //do something with f -} -BMW_end(&walker); -*/ + * example of usage, walking over an island of tool flagged faces: + * + * BMWalker walker; + * BMFace *f; + * + * BMW_init(&walker, bm, BMW_ISLAND, SOME_OP_FLAG); + * f = BMW_begin(&walker, some_start_face); + * for (; f; f = BMW_step(&walker)) + * { + * //do something with f + * } + * BMW_end(&walker); + */ enum { /* walk over connected geometry. can restrict to a search flag, |