diff options
Diffstat (limited to 'source/blender/editors/mesh/editmesh.c')
-rw-r--r-- | source/blender/editors/mesh/editmesh.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/source/blender/editors/mesh/editmesh.c b/source/blender/editors/mesh/editmesh.c index d1efb60b618..9376a21b23d 100644 --- a/source/blender/editors/mesh/editmesh.c +++ b/source/blender/editors/mesh/editmesh.c @@ -989,8 +989,6 @@ void load_editMesh(Scene *scene, Object *obedit) while(eve) { VECCOPY(mvert->co, eve->co); - mvert->mat_nr= 32767; /* what was this for, halos? */ - /* vertex normal */ VECCOPY(nor, eve->no); mul_v3_fl(nor, 32767.0); @@ -1063,20 +1061,6 @@ void load_editMesh(Scene *scene, Object *obedit) if(efa->f & 1) mface->flag |= ME_FACE_SEL; else mface->flag &= ~ME_FACE_SEL; } - - /* mat_nr in vertex */ - if(me->totcol>1) { - mvert= me->mvert+mface->v1; - if(mvert->mat_nr == (char)32767) mvert->mat_nr= mface->mat_nr; - mvert= me->mvert+mface->v2; - if(mvert->mat_nr == (char)32767) mvert->mat_nr= mface->mat_nr; - mvert= me->mvert+mface->v3; - if(mvert->mat_nr == (char)32767) mvert->mat_nr= mface->mat_nr; - if(mface->v4) { - mvert= me->mvert+mface->v4; - if(mvert->mat_nr == (char)32767) mvert->mat_nr= mface->mat_nr; - } - } /* watch: efa->e1->f2==0 means loose edge */ @@ -1197,7 +1181,9 @@ void load_editMesh(Scene *scene, Object *obedit) eve= em->verts.first; mvert = me->mvert; while(eve) { - VECSUB(ofs[i], mvert->co, oldverts[eve->keyindex].co); + if(eve->keyindex>=0) + VECSUB(ofs[i], mvert->co, oldverts[eve->keyindex].co); + eve= eve->next; i++; mvert++; |