diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-07-05 09:19:19 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-07-05 11:56:21 +0300 |
| commit | 020a420fe35e1b5b513780927b7f20107413e7c3 (patch) | |
| tree | 8cc9225ad0550769fd3a587746b6aefa75d72215 /source/blender/blenkernel/intern/pbvh_bmesh.c | |
| parent | 39ae324918176a1a94de0c6be4466fdffa2fe711 (diff) | |
Dyntopo: verify had over zealous asserts
Diffstat (limited to 'source/blender/blenkernel/intern/pbvh_bmesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/pbvh_bmesh.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c index 87d22d01275..d936b4e2dae 100644 --- a/source/blender/blenkernel/intern/pbvh_bmesh.c +++ b/source/blender/blenkernel/intern/pbvh_bmesh.c @@ -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)); } } |