Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix for over-allocation in BKE_pbvh_search_gather, BKE_pbvh_gather_proxies,

Browse Source 
each element was having the size of PBVHNode allocated rather then the size of a pointer (8 vs 184 bytes here)
This commit is contained in:
Campbell Barton
2013-08-03 18:05:30 +00:00
parent 2a8d76d734
commit da5b04a0c2
1 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -753,7 +753,7 @@ void BKE_pbvh_search_gather(PBVH *bvh,
PBVHNode ***r_array, int *r_tot) PBVHNode ***r_array, int *r_tot)
{ {
PBVHIter iter; PBVHIter iter;
PBVHNode **array = NULL, **newarray, *node; PBVHNode **array = NULL, *node;
int tot = 0, space = 0; int tot = 0, space = 0;
pbvh_iter_begin(&iter, bvh, scb, search_data); pbvh_iter_begin(&iter, bvh, scb, search_data);
@@ -763,14 +763,7 @@ void BKE_pbvh_search_gather(PBVH *bvh,
if (tot == space) { if (tot == space) {
/* resize array if needed */ /* resize array if needed */
space = (tot == 0) ? 32 : space * 2; space = (tot == 0) ? 32 : space * 2;
newarray = MEM_callocN(sizeof(PBVHNode) * space, "PBVHNodeSearch"); array = MEM_recallocN_id(array, sizeof(PBVHNode *) * space, __func__);
if (array) {
memcpy(newarray, array, sizeof(PBVHNode) * tot);
MEM_freeN(array);
}
array = newarray;
} }
array[tot] = node; array[tot] = node;
@@ -1807,7 +1800,7 @@ void BKE_pbvh_node_free_proxies(PBVHNode *node)
void BKE_pbvh_gather_proxies(PBVH *pbvh, PBVHNode ***r_array, int *r_tot) void BKE_pbvh_gather_proxies(PBVH *pbvh, PBVHNode ***r_array, int *r_tot)
{ {
PBVHNode **array = NULL, **newarray, *node; PBVHNode **array = NULL, *node;
int tot = 0, space = 0; int tot = 0, space = 0;
int n; int n;
@@ -1818,14 +1811,7 @@ void BKE_pbvh_gather_proxies(PBVH *pbvh, PBVHNode ***r_array, int *r_tot)
if (tot == space) { if (tot == space) {
/* resize array if needed */ /* resize array if needed */
space = (tot == 0) ? 32 : space * 2; space = (tot == 0) ? 32 : space * 2;
newarray = MEM_callocN(sizeof(PBVHNode) * space, "BKE_pbvh_gather_proxies"); array = MEM_recallocN_id(array, sizeof(PBVHNode *) * space, __func__);
if (array) {
memcpy(newarray, array, sizeof(PBVHNode) * tot);
MEM_freeN(array);
}
array = newarray;
} }
array[tot] = node; array[tot] = node;