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

Fix 28960: if BM_free_data_layer[_n] removed the last layer, we didn't clear data->pool and instead kept it pointing to the pool that gets freed at the end of update_data_blocks

Browse Source
This commit is contained in:
Andrew Wiggin
2011-10-26 13:24:58 +00:00
parent ca0a8566b9
commit cfb435e8a5
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2333,7 +2333,13 @@ void CustomData_from_bmeshpoly(CustomData *fdata, CustomData *pdata, CustomData
void CustomData_bmesh_init_pool(CustomData *data, int allocsize){
if(data->totlayer)data->pool = BLI_mempool_create(data->totsize, allocsize, allocsize, 1, 0);
/* Dispose old pools before calling here to avoid leaks */
BLI_assert(data->pool == NULL);
/* If there are no layers, no pool is needed just yet */
if (data->totlayer) {
data->pool = BLI_mempool_create(data->totsize, allocsize, allocsize, 1, 0);
}
}
void CustomData_bmesh_merge(CustomData *source, CustomData *dest,

17
source/blender/bmesh/intern/bmesh_interp.c
View File

@@ -880,13 +880,16 @@ static void update_data_blocks(BMesh *bm, CustomData *olddata, CustomData *data)
}
}
void BM_add_data_layer(BMesh *bm, CustomData *data, int type)
{
CustomData olddata;
olddata= *data;
olddata.layers= (olddata.layers)? MEM_dupallocN(olddata.layers): NULL;
/* the pool is now owned by olddata and must not be shared */
data->pool = NULL;
CustomData_add_layer(data, type, CD_DEFAULT, NULL, 0);
update_data_blocks(bm, &olddata, data);
@@ -899,6 +902,10 @@ void BM_add_data_layer_named(BMesh *bm, CustomData *data, int type, const char *
olddata= *data;
olddata.layers= (olddata.layers)? MEM_dupallocN(olddata.layers): NULL;
/* the pool is now owned by olddata and must not be shared */
data->pool = NULL;
CustomData_add_layer_named(data, type, CD_DEFAULT, NULL, 0, name);
update_data_blocks(bm, &olddata, data);
@@ -911,6 +918,10 @@ void BM_free_data_layer(BMesh *bm, CustomData *data, int type)
olddata= *data;
olddata.layers= (olddata.layers)? MEM_dupallocN(olddata.layers): NULL;
/* the pool is now owned by olddata and must not be shared */
data->pool = NULL;
CustomData_free_layer_active(data, type, 0);
update_data_blocks(bm, &olddata, data);
@@ -923,6 +934,10 @@ void BM_free_data_layer_n(BMesh *bm, CustomData *data, int type, int n)
olddata= *data;
olddata.layers= (olddata.layers)? MEM_dupallocN(olddata.layers): NULL;
/* the pool is now owned by olddata and must not be shared */
data->pool = NULL;
CustomData_free_layer(data, type, 0, CustomData_get_layer_index_n(data, type, n));
update_data_blocks(bm, &olddata, data);