griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix for error in recent commit. passing totface rather then totpoly, also add asserts if PBVH attempts to build without any faces (but with polys).

Browse Source
This commit is contained in:
Campbell Barton
2012-02-05 07:09:30 +00:00
parent 776ec0ec61
commit b0db9df701
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/intern/cdderivedmesh.c
View File

@@ -218,7 +218,7 @@ static ListBase *cdDM_getPolyMap(Object *ob, DerivedMesh *dm)
create_vert_poly_map(&cddm->pmap, &cddm->pmap_mem,
me->mpoly, me->mloop,
me->totvert, me->totface, me->totloop);
me->totvert, me->totpoly, me->totloop);
}
return cddm->pmap;
@@ -284,6 +284,7 @@ static struct PBVH *cdDM_getPBVH(Object *ob, DerivedMesh *dm)
Mesh *me= ob->data;
cddm->pbvh = BLI_pbvh_new();
cddm->pbvh_draw = can_pbvh_draw(ob, dm);
BLI_assert(!(me->mface == NULL && me->mpoly != NULL)); /* BMESH ONLY complain if mpoly is valid but not mface */
BLI_pbvh_build_mesh(cddm->pbvh, me->mface, me->mvert,
me->totface, me->totvert);

3
source/blender/blenkernel/intern/subsurf_ccg.c
View File

@@ -2747,7 +2747,7 @@ static ListBase *ccgDM_getPolyMap(Object *ob, DerivedMesh *dm)
create_vert_poly_map(&ccgdm->pmap, &ccgdm->pmap_mem,
me->mpoly, me->mloop,
me->totvert, me->totface, me->totloop);
me->totvert, me->totpoly, me->totloop);
}
return ccgdm->pmap;
@@ -2825,6 +2825,7 @@ static struct PBVH *ccgDM_getPBVH(Object *ob, DerivedMesh *dm)
} else if(ob->type == OB_MESH) {
Mesh *me= ob->data;
ob->sculpt->pbvh= ccgdm->pbvh = BLI_pbvh_new();
BLI_assert(!(me->mface == NULL && me->mpoly != NULL)); /* BMESH ONLY complain if mpoly is valid but not mface */
BLI_pbvh_build_mesh(ccgdm->pbvh, me->mface, me->mvert,
me->totface, me->totvert);
}