diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-12-14 18:24:53 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-12-14 18:24:53 +0400 |
| commit | f00728c19bb14106e2d4b1087cafa290c1d9b22e (patch) | |
| tree | 59826acf4557b6ce22e5fa04ed27388d307e6516 /source/blender/bmesh/intern | |
| parent | 1bebdc9ad0b6174a9aee243ad37fcc20db23791c (diff) | |
Fix bmesh compiler warning with OS X / clang.
Diffstat (limited to 'source/blender/bmesh/intern')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_polygon.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/bmesh/intern/bmesh_polygon.c b/source/blender/bmesh/intern/bmesh_polygon.c index e65c3fc578d..e2e1204e9c1 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; |