diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-06-24 03:22:19 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-24 03:22:19 +0400 |
| commit | 74c9c24d273863319a55c18234e03b7d27a43a87 (patch) | |
| tree | d2649f0552ecb573c7831567bdf921fbf516995c /source/blender/bmesh | |
| parent | 8ef4c4762be16d9e2f4f3fc274009f294893cd2e (diff) | |
style cleanyp
Diffstat (limited to 'source/blender/bmesh')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_core.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh_conv.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_walkers_impl.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c index a14d602c586..a51d6bd2940 100644 --- a/source/blender/bmesh/intern/bmesh_core.c +++ b/source/blender/bmesh/intern/bmesh_core.c @@ -384,7 +384,7 @@ int bmesh_elem_check(void *element, const char htype) err |= 256; if (l->e->head.htype != BM_EDGE) err |= 512; - if (l->v->head.htype != BM_VERT) + if (l->v->head.htype != BM_VERT) err |= 1024; if (!BM_vert_in_edge(l->e, l->v)) { fprintf(stderr, "%s: fatal bmesh error (vert not in edge)! (bmesh internal error)\n", __func__); diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.c b/source/blender/bmesh/intern/bmesh_mesh_conv.c index a8c27e0a761..123eb6829a3 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_conv.c +++ b/source/blender/bmesh/intern/bmesh_mesh_conv.c @@ -768,7 +768,7 @@ void BM_mesh_bm_to_me(BMesh *bm, Mesh *me, int dotess) /* editing the base key should update others */ if ((me->key->type == KEY_RELATIVE) && /* only need offsets for relative shape keys */ - (actkey != NULL) && /* unlikely, but the active key may not be valid if the + (actkey != NULL) && /* unlikely, but the active key may not be valid if the * bmesh and the mesh are out of sync */ (oldverts != NULL)) /* not used here, but 'oldverts' is used later for applying 'ofs' */ { diff --git a/source/blender/bmesh/intern/bmesh_walkers_impl.c b/source/blender/bmesh/intern/bmesh_walkers_impl.c index 4ae7b6cc350..a72bfe47127 100644 --- a/source/blender/bmesh/intern/bmesh_walkers_impl.c +++ b/source/blender/bmesh/intern/bmesh_walkers_impl.c @@ -547,7 +547,7 @@ static void *bmw_LoopWalker_step(BMWalker *walker) ((vert_edge_tot == 4 || vert_edge_tot == 2) && owalk.is_boundary == FALSE) || /* walk over boundary of faces but stop at corners */ - (owalk.is_boundary == TRUE && owalk.is_single == FALSE && vert_edge_tot > 2) || + (owalk.is_boundary == TRUE && owalk.is_single == FALSE && vert_edge_tot > 2) || /* initial edge was a boundary, so is this edge and vertex is only apart of this face * this lets us walk over the the boundary of an ngon which is handy */ |