[Bf-blender-cvs] [4795b61] master: Cleanup: assert / warn

[Campbell Barton]

Commit: 4795b61c1b4a112a4c9ee2637d5936988e19515a
Author: Campbell Barton
Date:   Mon Aug 18 16:04:44 2014 +1000
Branches: master
https://developer.blender.org/rB4795b61c1b4a112a4c9ee2637d5936988e19515a

Cleanup: assert / warn

===================================================================

M	source/blender/bmesh/intern/bmesh_mods.c
M	source/blender/editors/mesh/editmesh_intersect.c
M	source/blender/modifiers/intern/MOD_solidify.c

===================================================================

diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c
index 43f33a9..a0fa659 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 f11ef66..0888c3d 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 86115d9..0447f3b 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];