[Bf-blender-cvs] [3f744a1] master: Correct error in recent commit

Campbell Barton noreply at git.blender.org
Thu Jun 16 14:14:59 CEST 2016


Commit: 3f744a16c4ad62855a31151b0ad354519560ddc0
Author: Campbell Barton
Date:   Thu Jun 16 22:11:36 2016 +1000
Branches: master
https://developer.blender.org/rB3f744a16c4ad62855a31151b0ad354519560ddc0

Correct error in recent commit

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

M	source/blender/bmesh/tools/bmesh_decimate_collapse.c

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

diff --git a/source/blender/bmesh/tools/bmesh_decimate_collapse.c b/source/blender/bmesh/tools/bmesh_decimate_collapse.c
index 3ea7dae..1c8be09 100644
--- a/source/blender/bmesh/tools/bmesh_decimate_collapse.c
+++ b/source/blender/bmesh/tools/bmesh_decimate_collapse.c
@@ -632,6 +632,8 @@ static void bm_decim_triangulate_end(BMesh *bm, const int edges_tri_tot)
 	BMEdge **edges_tri = MEM_mallocN(MIN2(edges_tri_tot, bm->totedge) * sizeof(*edges_tri), __func__);
 	STACK_DECLARE(edges_tri);
 
+	STACK_INIT(edges_tri, MIN2(edges_tri_tot, bm->totedge));
+
 	/* boundary edges */
 	BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
 		BMLoop *l_a, *l_b;




More information about the Bf-blender-cvs mailing list