Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-02-23 07:40:43 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-02-23 07:40:43 +0300
commitbc876f9ea401f2de404fbf303038a0185d0a77ba (patch)
treebe3a10545860e8e912422f5c8ea8cf9b1483545d /source/blender/bmesh/intern/bmesh_interp.c
parent5a372dbd89a6adcad4191a5256ab66e607ab5d89 (diff)
Error in last commit
Accidentally left in malloc/free
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_interp.c')
-rw-r--r--source/blender/bmesh/intern/bmesh_interp.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/bmesh/intern/bmesh_interp.c b/source/blender/bmesh/intern/bmesh_interp.c
index af4bc90d695..0c27da36448 100644
--- a/source/blender/bmesh/intern/bmesh_interp.c
+++ b/source/blender/bmesh/intern/bmesh_interp.c
@@ -1116,12 +1116,11 @@ void BM_vert_loop_groups_data_layer_merge(BMesh *bm, LinkNode *groups, const int
{
const int type = bm->ldata.layers[layer_n].type;
const int size = CustomData_sizeof(type);
- void *data_tmp = malloc(size);
+ void *data_tmp = alloca(size);
do {
bm_vert_loop_groups_data_layer_merge__single(bm, groups->link, layer_n, data_tmp);
} while ((groups = groups->next));
- free(data_tmp);
}
/**
@@ -1132,12 +1131,11 @@ void BM_vert_loop_groups_data_layer_merge_weights(BMesh *bm, LinkNode *groups, i
{
const int type = bm->ldata.layers[layer_n].type;
const int size = CustomData_sizeof(type);
- void *data_tmp = malloc(size);
+ void *data_tmp = alloca(size);
do {
bm_vert_loop_groups_data_layer_merge_weights__single(bm, groups->link, layer_n, data_tmp, loop_weights);
} while ((groups = groups->next));
- free(data_tmp);
}
/** \} */ \ No newline at end of file