diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-04-05 03:57:32 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-04-05 05:14:05 +0400 |
| commit | af59ee340f8859bdcd5f09c54bcb48776adf0c0a (patch) | |
| tree | 710718e1336b37d007adfd24f5aaec9b83277fbb /source/blender/blenkernel/intern | |
| parent | 321c35ec6ccc91057329af9e5a139715ddc38486 (diff) | |
Mempool: remove BLI_MEMPOOL_SYSMALLOC, MEM_* allocs are more efficient now
Diffstat (limited to 'source/blender/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/customdata.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/pbvh_bmesh.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index a628504268a..41eb2f5982e 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -2408,7 +2408,7 @@ void CustomData_bmesh_init_pool(CustomData *data, int totelem, const char htype) /* If there are no layers, no pool is needed just yet */ if (data->totlayer) { - data->pool = BLI_mempool_create(data->totsize, totelem, chunksize, BLI_MEMPOOL_SYSMALLOC); + data->pool = BLI_mempool_create(data->totsize, totelem, chunksize, BLI_MEMPOOL_NOP); } } diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c index bb3561d38a6..0bdd786f23e 100644 --- a/source/blender/blenkernel/intern/pbvh_bmesh.c +++ b/source/blender/blenkernel/intern/pbvh_bmesh.c @@ -1189,8 +1189,7 @@ bool BKE_pbvh_bmesh_update_topology(PBVH *bvh, PBVHTopologyUpdateMode mode, if (mode & PBVH_Collapse) { EdgeQueue q; - BLI_mempool *queue_pool = BLI_mempool_create(sizeof(BMVert *[2]), - 128, 128, 0); + BLI_mempool *queue_pool = BLI_mempool_create(sizeof(BMVert *[2]), 128, 128, BLI_MEMPOOL_NOP); EdgeQueueContext eq_ctx = {&q, queue_pool, bvh->bm, cd_vert_mask_offset}; short_edge_queue_create(&eq_ctx, bvh, center, radius); @@ -1203,8 +1202,7 @@ bool BKE_pbvh_bmesh_update_topology(PBVH *bvh, PBVHTopologyUpdateMode mode, if (mode & PBVH_Subdivide) { EdgeQueue q; - BLI_mempool *queue_pool = BLI_mempool_create(sizeof(BMVert *[2]), - 128, 128, 0); + BLI_mempool *queue_pool = BLI_mempool_create(sizeof(BMVert *[2]), 128, 128, BLI_MEMPOOL_NOP); EdgeQueueContext eq_ctx = {&q, queue_pool, bvh->bm, cd_vert_mask_offset}; long_edge_queue_create(&eq_ctx, bvh, center, radius); |