[Bf-blender-cvs] [f00728c] master: Fix bmesh compiler warning with OS X / clang.
Brecht Van Lommel
noreply at git.blender.org
Sat Dec 14 15:26:04 CET 2013
Commit: f00728c19bb14106e2d4b1087cafa290c1d9b22e
Author: Brecht Van Lommel
Date: Sat Dec 14 15:24:53 2013 +0100
http://developer.blender.org/rBf00728c19bb14106e2d4b1087cafa290c1d9b22e
Fix bmesh compiler warning with OS X / clang.
===================================================================
M source/blender/bmesh/intern/bmesh_polygon.c
===================================================================
diff --git a/source/blender/bmesh/intern/bmesh_polygon.c b/source/blender/bmesh/intern/bmesh_polygon.c
index e65c3fc..e2e1204 100644
--- a/source/blender/bmesh/intern/bmesh_polygon.c
+++ b/source/blender/bmesh/intern/bmesh_polygon.c
@@ -983,9 +983,12 @@ void BM_face_triangulate(BMesh *bm, BMFace *f,
for (i = 0; i < edge_array_len; i++) {
BMFace *f_a, *f_b;
BMEdge *e = edge_array[i];
+#ifndef NDEBUG
const bool ok = BM_edge_face_pair(e, &f_a, &f_b);
-
BLI_assert(ok);
+#else
+ BM_edge_face_pair(e, &f_a, &f_b);
+#endif
if (FACE_USED_TEST(f_a) == false) {
FACE_USED_SET(f_a);
@@ -1233,7 +1236,11 @@ void BM_bmesh_calc_tessellation(BMesh *bm, BMLoop *(*looptris)[3], int *r_looptr
/* this assumes all faces can be scan-filled, which isn't always true,
* worst case we over alloc a little which is acceptable */
+#ifndef NDEBUG
const int looptris_tot = poly_to_tri_count(bm->totface, bm->totloop);
+#else
+ poly_to_tri_count(bm->totface, bm->totloop);
+#endif
BMIter iter;
BMFace *efa;
More information about the Bf-blender-cvs
mailing list