sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

correct BM_edge_face_pair() being called inside BLI_assert() - this needed to run every time.

Browse Source 
also other minor changes.
This commit is contained in:
Campbell Barton 2013-10-16 22:07:16 +00:00
parent bd2d7bedbd
commit 234626f9e1
1 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
source/blender/bmesh/intern/bmesh_polygon.c
View File

@ -814,7 +814,6 @@ bool BM_face_point_inside_test(BMFace *f, const float co[3])
* *
* \note use_tag tags new flags and edges. * \note use_tag tags new flags and edges.
*/ */
#define SF_EDGE_IS_BOUNDARY 0xff
void BM_face_triangulate(BMesh *bm, BMFace *f, void BM_face_triangulate(BMesh *bm, BMFace *f,
BMFace **r_faces_new, BMFace **r_faces_new,
MemArena *sf_arena, MemArena *sf_arena,
@ -827,6 +826,8 @@ void BM_face_triangulate(BMesh *bm, BMFace *f,
BMEdge **edge_array; BMEdge **edge_array;
int edge_array_len; int edge_array_len;
#define SF_EDGE_IS_BOUNDARY 0xff
BLI_assert(BM_face_is_normal_valid(f)); BLI_assert(BM_face_is_normal_valid(f));
@ -959,35 +960,47 @@ void BM_face_triangulate(BMesh *bm, BMFace *f,
* we need to re-populate the r_faces_new array * we need to re-populate the r_faces_new array
* with the new faces * with the new faces
*/ */
BMEdge *e;
BMFace *fa, *fb;
int i; int i;
#define FACE_USED_TEST(f) (BM_elem_index_get(f) == -2)
#define FACE_USED_SET(f) BM_elem_index_set(f, -2)
nf_i = 0; nf_i = 0;
for (i = 0; i < edge_array_len; i++) { for (i = 0; i < edge_array_len; i++) {
e = edge_array[i]; BMFace *f_a, *f_b;
BLI_assert(BM_edge_face_pair(e, &fa, &fb)); BMEdge *e = edge_array[i];
const bool ok = BM_edge_face_pair(e, &f_a, &f_b);
BLI_assert(ok);
if (i == edge_array_len - 1) { if (i == edge_array_len - 1) {
if (BM_elem_index_get(fa) != -2) if (FACE_USED_TEST(f_a) == false) {
f_new = fa; f_new = f_a;
else if (BM_elem_index_get(fb) != -2) }
f_new = fb; else if (FACE_USED_TEST(f_b) == false) {
else f_new = f_b;
}
else {
BLI_assert(false); BLI_assert(false);
}
} }
else { else {
if (BM_elem_index_get(fa) != -2) { if (FACE_USED_TEST(f_a) == false) {
r_faces_new[nf_i++] = fa; FACE_USED_SET(f_a);
BM_elem_index_set(fa, -2); r_faces_new[nf_i++] = f_a;
} }
if (BM_elem_index_get(fb) != -2) { if (FACE_USED_TEST(f_b) == false) {
r_faces_new[nf_i++] = fb; FACE_USED_SET(f_b);
BM_elem_index_set(fb, -2); r_faces_new[nf_i++] = f_b;
} }
} }
} }
#undef FACE_USED_TEST
#undef FACE_USED_SET
/* nf_i doesn't include the last face */ /* nf_i doesn't include the last face */
BLI_assert(nf_i == orig_f_len - 3); BLI_assert(nf_i == orig_f_len - 3);
@ -1001,6 +1014,9 @@ void BM_face_triangulate(BMesh *bm, BMFace *f,
/* garbage collection */ /* garbage collection */
BLI_scanfill_end_arena(&sf_ctx, sf_arena); BLI_scanfill_end_arena(&sf_ctx, sf_arena);
} }
#undef SF_EDGE_IS_BOUNDARY
} }
/** /**