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

speedup for freeing bmeshes, skip calling free on every

Browse Source 
vert/edge/face/loop if there are no free functions for the customdata
layers.
This commit is contained in:
Campbell Barton
2013-05-08 12:59:56 +00:00
parent c6702a3b91
commit f554c264da
3 changed files with 44 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/BKE_customdata.h
View File

@@ -88,6 +88,7 @@ bool CustomData_layer_has_interp(struct CustomData *data, int layer_n);
*/
bool CustomData_has_math(struct CustomData *data);
bool CustomData_has_interp(struct CustomData *data);
bool CustomData_bmesh_has_free(struct CustomData *data);
/* copies the "value" (e.g. mloopuv uv or mloopcol colors) from one block to
* another, while not overwriting anything else (e.g. flags). probably only

17
source/blender/blenkernel/intern/customdata.c
View File

@@ -2552,6 +2552,23 @@ bool CustomData_has_math(struct CustomData *data)
return false;
}
/* a non bmesh version would have to check layer->data */
bool CustomData_bmesh_has_free(struct CustomData *data)
{
const LayerTypeInfo *typeInfo;
int i;
for (i = 0; i < data->totlayer; ++i) {
if (!(data->layers[i].flag & CD_FLAG_NOFREE)) {
typeInfo = layerType_getInfo(data->layers[i].type);
if (typeInfo->free) {
return true;
}
}
}
return false;
}
bool CustomData_has_interp(struct CustomData *data)
{
int i;

36
source/blender/bmesh/intern/bmesh_mesh.c
View File

@@ -164,21 +164,37 @@ void BM_mesh_data_free(BMesh *bm)
BMEdge *e;
BMLoop *l;
BMFace *f;
BMIter iter;
BMIter itersub;
BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
CustomData_bmesh_free_block(&(bm->vdata), &(v->head.data));
bool is_ldata_free;
bool is_pdata_free;
/* Check if we have to call free, if not we can avoid a lot of looping */
if (CustomData_bmesh_has_free(&(bm->vdata))) {
BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
CustomData_bmesh_free_block(&(bm->vdata), &(v->head.data));
}
}
BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
CustomData_bmesh_free_block(&(bm->edata), &(e->head.data));
if (CustomData_bmesh_has_free(&(bm->edata))) {
BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
CustomData_bmesh_free_block(&(bm->edata), &(e->head.data));
}
}
BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
CustomData_bmesh_free_block(&(bm->pdata), &(f->head.data));
BM_ITER_ELEM (l, &itersub, f, BM_LOOPS_OF_FACE) {
CustomData_bmesh_free_block(&(bm->ldata), &(l->head.data));
if ((is_ldata_free = CustomData_bmesh_has_free(&(bm->ldata))) ||
(is_pdata_free = CustomData_bmesh_has_free(&(bm->pdata))))
{
BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
if (is_pdata_free)
CustomData_bmesh_free_block(&(bm->pdata), &(f->head.data));
if (is_ldata_free) {
BM_ITER_ELEM (l, &itersub, f, BM_LOOPS_OF_FACE) {
CustomData_bmesh_free_block(&(bm->ldata), &(l->head.data));
}
}
}
}