diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-08-18 10:04:44 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-08-18 10:05:06 +0400 |
| commit | 4795b61c1b4a112a4c9ee2637d5936988e19515a (patch) | |
| tree | e53fc7ac42452a1a24ab7754d80500be8c636450 /source | |
| parent | baea85b4498315bc085712626511119e05aed237 (diff) | |
Cleanup: assert / warn
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mods.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_intersect.c | 2 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_solidify.c | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c index 43f33a9de0f..a0fa65967d3 100644 --- a/source/blender/bmesh/intern/bmesh_mods.c +++ b/source/blender/bmesh/intern/bmesh_mods.c @@ -796,6 +796,7 @@ bool BM_face_split_edgenet( #ifdef DEBUG for (i = 0; i < edge_net_len; i++) { BLI_assert(BM_ELEM_API_FLAG_TEST(edge_net[i], EDGE_NET) == 0); + BLI_assert(BM_edge_in_face(edge_net[i], f) == false); } l_iter = l_first = BM_FACE_FIRST_LOOP(f); do { diff --git a/source/blender/editors/mesh/editmesh_intersect.c b/source/blender/editors/mesh/editmesh_intersect.c index f11ef66ecb0..0888c3da3f5 100644 --- a/source/blender/editors/mesh/editmesh_intersect.c +++ b/source/blender/editors/mesh/editmesh_intersect.c @@ -84,7 +84,6 @@ static void bm_face_split_by_edges(BMesh *bm, BMFace *f, const char hflag) if (BM_elem_flag_test(e, hflag) && (BM_elem_index_get(e) == f_index)) { - BMVert *v; v = BM_edge_other_vert(e, l_iter->v); v->e = e; @@ -180,7 +179,6 @@ static int edbm_face_split_by_edges_exec(bContext *C, wmOperator *UNUSED(op)) BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(e, hflag)) { BMIter viter; - BMVert *v; BM_ITER_ELEM (v, &viter, e, BM_VERTS_OF_EDGE) { BMIter liter; BMLoop *l; diff --git a/source/blender/modifiers/intern/MOD_solidify.c b/source/blender/modifiers/intern/MOD_solidify.c index 86115d9937a..0447f3b7067 100644 --- a/source/blender/modifiers/intern/MOD_solidify.c +++ b/source/blender/modifiers/intern/MOD_solidify.c @@ -398,7 +398,7 @@ static DerivedMesh *applyModifier( for (i = 0, j = (int)numEdges; i < numEdges; i++) { if (!ELEM(edge_users[i], INVALID_UNUSED, INVALID_PAIR)) { - MEdge* ed_src, *ed_dst; + MEdge *ed_src, *ed_dst; DM_copy_edge_data(dm, result, i, j, 1); ed_src = &medge[i]; |