diff options
Diffstat (limited to 'source/blender/editors/mesh/editmesh.c')
| -rw-r--r-- | source/blender/editors/mesh/editmesh.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/mesh/editmesh.c b/source/blender/editors/mesh/editmesh.c index 58041120a42..77371fdbd20 100644 --- a/source/blender/editors/mesh/editmesh.c +++ b/source/blender/editors/mesh/editmesh.c @@ -643,7 +643,7 @@ static int edgeDrawFlagInfo_cmp(const void *av, const void *bv) } #endif -static void edge_drawflags(EditMesh *em) +static void edge_drawflags(Mesh *me, EditMesh *em) { EditVert *eve; EditEdge *eed, *e1, *e2, *e3, *e4; @@ -692,7 +692,7 @@ static void edge_drawflags(EditMesh *em) efa= efa->next; } - if(G.f & G_ALLEDGES) { + if(me->drawflag & ME_ALLEDGES) { efa= em->faces.first; while(efa) { if(efa->e1->f2>=2) efa->e1->f2= 1; @@ -1042,7 +1042,7 @@ void load_editMesh(Scene *scene, Object *ob) /* eed->f1 : flag for dynaface (cylindertest, old engine) */ /* eve->f1 : flag for dynaface (sphere test, old engine) */ /* eve->f2 : being used in vertexnormals */ - edge_drawflags(em); + edge_drawflags(me, em); EM_stats_update(em); @@ -1146,9 +1146,9 @@ void load_editMesh(Scene *scene, Object *ob) eve->tmp.l = a++; /* counter */ mvert->flag= 0; - if(eve->f1==1) mvert->flag |= ME_SPHERETEST; mvert->flag |= (eve->f & SELECT); if (eve->h) mvert->flag |= ME_HIDE; + mvert->bweight= (char)(255.0*eve->bweight); eve= eve->next; |