blender
/
blender
135
403
Fork 586
Code Issues 6.2k Pull Requests 760 Projects 19 Wiki Activity

Sculpt-dev: Yet another pbvh cache crash

This commit is contained in:
Joseph Eagar 2022-03-24 10:46:11 -07:00
parent 34d8df4aba
commit 711bcef7f4
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/blenkernel/intern/pbvh.c
View File

@ -4945,19 +4945,29 @@ ATTR_NO_OPT bool BKE_pbvh_cache_is_valid(const Object *ob,
GHash *cached_pbvhs = NULL;
static void pbvh_clear_cached_pbvhs(PBVH *exclude)
{
PBVH **pbvhs = NULL;
BLI_array_staticdeclare(pbvhs, 8);
GHashIterator iter;
GHASH_ITER (iter, cached_pbvhs) {
PBVH *pbvh = BLI_ghashIterator_getValue(&iter);
if (pbvh != exclude) {
if (pbvh->bm) {
BM_mesh_free(pbvh->bm);
}
BKE_pbvh_free(pbvh);
BLI_array_append(pbvhs, pbvh);
}
}
for (int i = 0; i < BLI_array_len(pbvhs); i++) {
PBVH *pbvh = pbvhs[i];
if (pbvh->bm) {
BM_mesh_free(pbvh->bm);
}
BKE_pbvh_free(pbvh);
}
BLI_array_free(pbvhs);
BLI_ghash_clear(cached_pbvhs, MEM_freeN, NULL);
}