[Bf-blender-cvs] [bc876f9] master: Error in last commit

Campbell Barton noreply at git.blender.org
Mon Feb 23 05:47:03 CET 2015


Commit: bc876f9ea401f2de404fbf303038a0185d0a77ba
Author: Campbell Barton
Date:   Mon Feb 23 15:40:43 2015 +1100
Branches: master
https://developer.blender.org/rBbc876f9ea401f2de404fbf303038a0185d0a77ba

Error in last commit

Accidentally left in malloc/free

===================================================================

M	source/blender/bmesh/intern/bmesh_interp.c

===================================================================

diff --git a/source/blender/bmesh/intern/bmesh_interp.c b/source/blender/bmesh/intern/bmesh_interp.c
index af4bc90..0c27da3 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




More information about the Bf-blender-cvs mailing list