archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Dyntopo: verify had over zealous asserts

Browse Source
This commit is contained in:
Campbell Barton
2016-07-05 16:19:19 +10:00
parent 39ae324918
commit 020a420fe3
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenkernel/intern/pbvh_bmesh.c
View File

@@ -1914,6 +1914,7 @@ static void pbvh_bmesh_verify(PBVH *bvh)
{
BMFace *f;
BM_ITER_MESH(f, &iter, bvh->bm, BM_FACES_OF_MESH) {
BLI_assert(BM_ELEM_CD_GET_INT(f, bvh->cd_face_node_offset) != DYNTOPO_NODE_NONE);
BLI_gset_insert(faces_all, f);
}
}
@@ -1998,14 +1999,14 @@ static void pbvh_bmesh_verify(PBVH *bvh)
* adjacent faces */
bool found = false;
BMIter bm_iter;
BMFace *f;
BMFace *f = NULL;
BM_ITER_ELEM (f, &bm_iter, v, BM_FACES_OF_VERT) {
if (pbvh_bmesh_node_lookup(bvh, f) == n) {
found = true;
break;
}
}
BLI_assert(found);
BLI_assert(found || f == NULL);
#if 1
/* total freak stuff, check if node exists somewhere else */
@@ -2061,7 +2062,8 @@ static void pbvh_bmesh_verify(PBVH *bvh)
GSET_ITER (gs_iter, n->bm_other_verts) {
BMVert *v = BLI_gsetIterator_getKey(&gs_iter);
BLI_assert(!BM_vert_face_check(v));
/* this happens sometimes and seems harmless */
// BLI_assert(!BM_vert_face_check(v));
BLI_assert(BLI_gset_haskey(verts_all, v));
}
}