Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-12-01 05:41:56 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-12-01 05:41:56 +0400
commitf06bbaed9263fbcc00a91ca47edcaace288efe9c (patch)
treeae72a5ae61f9d9f1f07f0e5292d42004272b20a6 /source/blender/blenkernel/intern/modifiers_bmesh.c
parent25098c741b4ee227b4d63ab3d56bb5e829305612 (diff)
split BMFlags_To_MEFlags & MEFlags_To_BMFlags into type specific calls, since we always know the types with these functions theres not much point in having generic calls with a type switch.
Diffstat (limited to 'source/blender/blenkernel/intern/modifiers_bmesh.c')
-rw-r--r--source/blender/blenkernel/intern/modifiers_bmesh.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/modifiers_bmesh.c b/source/blender/blenkernel/intern/modifiers_bmesh.c
index 2dc994b2159..079d8fad7cb 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.hflag = MEFlags_To_BMFlags(mv->flag, BM_VERT);
+ v->head.hflag = BM_Vert_Flag_From_MEFlag(mv->flag);
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.hflag = MEFlags_To_BMFlags(me->flag, BM_EDGE);
+ e->head.hflag = BM_Edge_Flag_From_MEFlag(me->flag);
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.hflag = MEFlags_To_BMFlags(mp->flag, BM_FACE);
+ f->head.hflag = BM_Vert_Flag_From_MEFlag(mp->flag);
f->mat_nr = mp->mat_nr;
l = BMIter_New(&liter, bm, BM_LOOPS_OF_FACE, f);