diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-11-01 18:36:23 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-01 18:36:23 +0400 |
commit | 85e0609c54f52068ac53435e80dda6d04b1a1373 (patch) | |
tree | 436d0d2949a5d222ed9d22b09d7f29864b7337ca /source/blender/blenkernel | |
parent | a1e95e2e1818ffc88aa5079916b1ee51c1e585f0 (diff) |
use char for BMHeader type and flag (saves 2 bytes per edge/loop/vertex/face)
also found mouse_mesh_shortest_path was casting edit selecton to the wrong type.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/editderivedbmesh.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/modifiers_bmesh.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/editderivedbmesh.c b/source/blender/blenkernel/intern/editderivedbmesh.c index affc34ad150..05d55d25093 100644 --- a/source/blender/blenkernel/intern/editderivedbmesh.c +++ b/source/blender/blenkernel/intern/editderivedbmesh.c @@ -629,7 +629,7 @@ static void bmDM_drawMappedFaces(DerivedMesh *dm, int drawSmooth; efa = l[0]->f; - drawSmooth = (efa->head.flag & BM_SMOOTH); + drawSmooth= BM_TestHFlag(efa, BM_SMOOTH); draw = setDrawOptions==NULL ? 1 : setDrawOptions(userData, BM_GetIndex(efa), &drawSmooth); if(draw) { @@ -697,7 +697,7 @@ static void bmDM_drawMappedFaces(DerivedMesh *dm, int drawSmooth; efa = l[0]->f; - drawSmooth = (efa->head.flag & BM_SMOOTH); + drawSmooth= BM_TestHFlag(efa, BM_SMOOTH); draw = setDrawOptions==NULL ? 1 : setDrawOptions(userData, BM_GetIndex(efa), &drawSmooth); if(draw) { diff --git a/source/blender/blenkernel/intern/modifiers_bmesh.c b/source/blender/blenkernel/intern/modifiers_bmesh.c index df650695c5c..45c642fc0f3 100644 --- a/source/blender/blenkernel/intern/modifiers_bmesh.c +++ b/source/blender/blenkernel/intern/modifiers_bmesh.c @@ -148,7 +148,7 @@ BMEditMesh *CDDM_To_BMesh(Object *ob, DerivedMesh *dm, BMEditMesh *existing) for (i=0; i<totvert; i++, mv++) { v = BM_Make_Vert(bm, mv->co, NULL); normal_short_to_float_v3(v->no, mv->no); - v->head.flag = MEFlags_To_BMFlags(mv->flag, BM_VERT); + v->head.hflag = MEFlags_To_BMFlags(mv->flag, BM_VERT); CustomData_to_bmesh_block(&dm->vertData, &bm->vdata, i, &v->head.data); vtable[i] = v; @@ -160,7 +160,7 @@ BMEditMesh *CDDM_To_BMesh(Object *ob, DerivedMesh *dm, BMEditMesh *existing) for (i=0; i<totedge; i++, me++) { e = BM_Make_Edge(bm, vtable[me->v1], vtable[me->v2], NULL, 0); - e->head.flag = MEFlags_To_BMFlags(me->flag, BM_EDGE); + e->head.hflag = MEFlags_To_BMFlags(me->flag, BM_EDGE); CustomData_to_bmesh_block(&dm->edgeData, &bm->edata, i, &e->head.data); etable[i] = e; @@ -190,7 +190,7 @@ BMEditMesh *CDDM_To_BMesh(Object *ob, DerivedMesh *dm, BMEditMesh *existing) if (!f) continue; - f->head.flag = MEFlags_To_BMFlags(mp->flag, BM_FACE); + f->head.hflag = MEFlags_To_BMFlags(mp->flag, BM_FACE); f->mat_nr = mp->mat_nr; l = BMIter_New(&liter, bm, BM_LOOPS_OF_FACE, f); |