can't use alloca in inline functions (fills up stack - I thought compiler would be smart here).

also reserve the exact number of vert/face/edge/loops when creating a bmesh during undo.

4 files changed, 23 insertions, 17 deletions

diff --git a/source/blender/blenkernel/intern/modifiers_bmesh.c b/source/blender/blenkernel/intern/modifiers_bmesh.c
index fa46c425c7e..85ed20bcb14 100644
--- a/source/blender/blenkernel/intern/modifiers_bmesh.c
+++ b/source/blender/blenkernel/intern/modifiers_bmesh.c
@@ -41,8 +41,8 @@
 #include "BKE_editmesh.h"
 
 /* Static function for alloc */
-BLI_INLINE BMFace *bm_face_create_from_mpoly(MPoly *mp, MLoop *ml,
-                                             BMesh *bm, BMVert **vtable, BMEdge **etable)
+static BMFace *bm_face_create_from_mpoly(MPoly *mp, MLoop *ml,
+                                         BMesh *bm, BMVert **vtable, BMEdge **etable)
 {
 	BMVert **verts = BLI_array_alloca(verts, mp->totloop);
 	BMEdge **edges = BLI_array_alloca(edges, mp->totloop);
@@ -71,8 +71,7 @@ void DM_to_bmesh_ex(DerivedMesh *dm, BMesh *bm)
 	BMEdge *e, **etable;
 	float (*face_normals)[3];
 	BMFace *f;
-	BMIter liter;
-	int i, k, totvert, totedge /* , totface */ /* UNUSED */ ;
+	int i, j, totvert, totedge /* , totface */ /* UNUSED */ ;
 	bool is_init = (bm->totvert == 0) && (bm->totedge == 0) && (bm->totface == 0);
 	bool is_cddm = (dm->type == DM_TYPE_CDDM);  /* duplicate the arrays for non cddm */
 	char has_orig_hflag = 0;
@@ -160,7 +159,8 @@ void DM_to_bmesh_ex(DerivedMesh *dm, BMesh *bm)
 	mloop = dm->getLoopArray(dm);
 	face_normals = CustomData_get_layer(&dm->polyData, CD_NORMAL);  /* can be NULL */
 	for (i = 0; i < dm->numPolyData; i++, mp++) {
-		BMLoop *l;
+		BMLoop *l_iter;
+		BMLoop *l_first;
 
 		f = bm_face_create_from_mpoly(mp, mloop + mp->loopstart,
 		                              bm, vtable, etable);
@@ -173,11 +173,12 @@ void DM_to_bmesh_ex(DerivedMesh *dm, BMesh *bm)
 		BM_elem_index_set(f, bm->totface - 1); /* set_inline */
 		f->mat_nr = mp->mat_nr;
 
-		l = BM_iter_new(&liter, bm, BM_LOOPS_OF_FACE, f);
-
-		for (k = mp->loopstart; l; l = BM_iter_step(&liter), k++) {
-			CustomData_to_bmesh_block(&dm->loopData, &bm->ldata, k, &l->head.data, true);
-		}
+		j = mp->loopstart;
+		l_iter = l_first = BM_FACE_FIRST_LOOP(f);
+		do {
+			/* Save index of correspsonding MLoop */
+			CustomData_to_bmesh_block(&dm->loopData, &bm->ldata, j++, &l_iter->head.data, true);
+		} while ((l_iter = l_iter->next) != l_first);
 
 		CustomData_to_bmesh_block(&dm->polyData, &bm->pdata, i, &f->head.data, true);
 
diff --git a/source/blender/bmesh/intern/bmesh_construct.c b/source/blender/bmesh/intern/bmesh_construct.c
index 55c738b04b4..3a8c6651c8a 100644
--- a/source/blender/bmesh/intern/bmesh_construct.c
+++ b/source/blender/bmesh/intern/bmesh_construct.c
@@ -866,10 +866,10 @@ BMesh *BM_mesh_copy(BMesh *bm_old)
 	BMEditSelection *ese;
 	BMIter iter, liter;
 	int i, j;
-	BMAllocTemplate allocsize = {bm_old->totvert,
-	                             bm_old->totedge,
-	                             bm_old->totloop,
-	                             bm_old->totface};
+	const BMAllocTemplate allocsize = {bm_old->totvert,
+	                                   bm_old->totedge,
+	                                   bm_old->totloop,
+	                                   bm_old->totface};
 
 	/* allocate a bmesh */
 	bm_new = BM_mesh_create(&allocsize);
diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.c b/source/blender/bmesh/intern/bmesh_mesh_conv.c
index aab60d7f9f1..6d1db98f32e 100644
--- a/source/blender/bmesh/intern/bmesh_mesh_conv.c
+++ b/source/blender/bmesh/intern/bmesh_mesh_conv.c
@@ -164,8 +164,8 @@ char BM_mesh_cd_flag_from_bmesh(BMesh *bm)
 }
 
 /* Static function for alloc (duplicate in modifiers_bmesh.c) */
-BLI_INLINE BMFace *bm_face_create_from_mpoly(MPoly *mp, MLoop *ml,
-                                             BMesh *bm, BMVert **vtable, BMEdge **etable)
+static BMFace *bm_face_create_from_mpoly(MPoly *mp, MLoop *ml,
+                                         BMesh *bm, BMVert **vtable, BMEdge **etable)
 {
 	BMVert **verts = BLI_array_alloca(verts, mp->totloop);
 	BMEdge **edges = BLI_array_alloca(edges, mp->totloop);
diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c
index c2263fc8cf5..719c7ab95e3 100644
--- a/source/blender/editors/mesh/editmesh_utils.c
+++ b/source/blender/editors/mesh/editmesh_utils.c
@@ -639,11 +639,16 @@ static void undoMesh_to_editbtMesh(void *umv, void *em_v, void *UNUSED(obdata))
 	UndoMesh *um = umv;
 	BMesh *bm;
 
+	const BMAllocTemplate allocsize = {um->me.totvert,
+	                                   um->me.totedge,
+	                                   um->me.totloop,
+	                                   um->me.totpoly};
+
 	ob->shapenr = em->bm->shapenr = um->shapenr;
 
 	EDBM_mesh_free(em);
 
-	bm = BM_mesh_create(&bm_mesh_allocsize_default);
+	bm = BM_mesh_create(&allocsize);
 
 	BM_mesh_bm_from_me(bm, &um->me, false, ob->shapenr);