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

Fix for error in looptri commit

Browse Source 
Sculpting w/ subsurf crashed
This commit is contained in:
Campbell Barton
2015-07-17 04:22:24 +10:00
parent 9d090c4717
commit 67acde92bb
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,6 +59,7 @@
#include "BKE_ccg.h" #include "BKE_ccg.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_global.h" #include "BKE_global.h"
#include "BKE_mesh.h"
#include "BKE_mesh_mapping.h" #include "BKE_mesh_mapping.h"
#include "BKE_multires.h" #include "BKE_multires.h"
#include "BKE_paint.h" #include "BKE_paint.h"
@@ -3569,6 +3570,12 @@ static struct PBVH *ccgDM_getPBVH(Object *ob, DerivedMesh *dm)
looptri = MEM_mallocN(sizeof(*looptri) * looptris_num, __func__); looptri = MEM_mallocN(sizeof(*looptri) * looptris_num, __func__);
BKE_mesh_recalc_looptri(
me->mloop, me->mpoly,
me->mvert,
me->totloop, me->totpoly,
looptri);
ob->sculpt->pbvh = ccgdm->pbvh = BKE_pbvh_new(); ob->sculpt->pbvh = ccgdm->pbvh = BKE_pbvh_new();
BLI_assert(!(me->mface == NULL && me->mpoly != NULL)); /* BMESH ONLY complain if mpoly is valid but not mface */ BLI_assert(!(me->mface == NULL && me->mpoly != NULL)); /* BMESH ONLY complain if mpoly is valid but not mface */
BKE_pbvh_build_mesh(ccgdm->pbvh, me->mpoly, me->mloop, me->mvert, me->totvert, &me->vdata, BKE_pbvh_build_mesh(ccgdm->pbvh, me->mpoly, me->mloop, me->mvert, me->totvert, &me->vdata,