[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56616] trunk/blender/source/blender: can' t use alloca in inline functions ( fills up stack - I thought compiler would be smart here).
Campbell Barton
ideasman42 at gmail.com
Thu May 9 13:42:25 CEST 2013
Revision: 56616
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56616
Author: campbellbarton
Date: 2013-05-09 11:42:24 +0000 (Thu, 09 May 2013)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
trunk/blender/source/blender/bmesh/intern/bmesh_construct.c
trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c
trunk/blender/source/blender/editors/mesh/editmesh_utils.c
Modified: trunk/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/modifiers_bmesh.c 2013-05-09 10:44:38 UTC (rev 56615)
+++ trunk/blender/source/blender/blenkernel/intern/modifiers_bmesh.c 2013-05-09 11:42:24 UTC (rev 56616)
@@ -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 @@
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 @@
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,12 +173,13 @@
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);
+ 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);
- for (k = mp->loopstart; l; l = BM_iter_step(&liter), k++) {
- CustomData_to_bmesh_block(&dm->loopData, &bm->ldata, k, &l->head.data, true);
- }
-
CustomData_to_bmesh_block(&dm->polyData, &bm->pdata, i, &f->head.data, true);
if (face_normals) {
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_construct.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_construct.c 2013-05-09 10:44:38 UTC (rev 56615)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_construct.c 2013-05-09 11:42:24 UTC (rev 56616)
@@ -866,10 +866,10 @@
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);
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c 2013-05-09 10:44:38 UTC (rev 56615)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c 2013-05-09 11:42:24 UTC (rev 56616)
@@ -164,8 +164,8 @@
}
/* 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);
Modified: trunk/blender/source/blender/editors/mesh/editmesh_utils.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_utils.c 2013-05-09 10:44:38 UTC (rev 56615)
+++ trunk/blender/source/blender/editors/mesh/editmesh_utils.c 2013-05-09 11:42:24 UTC (rev 56616)
@@ -639,11 +639,16 @@
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);
More information about the Bf-blender-cvs
mailing list