diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-10-15 17:33:56 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-10-15 17:33:56 +0400 |
| commit | 158534d40460bab6f5781384dfdc11d3b93f81bc (patch) | |
| tree | ff7997c6ed521347ca25ea6d76e3a437cd8ce1e7 /source/blender/editors/mesh/editmesh.c | |
| parent | fe649ec580cf9fa0da1ca81a97b17a92fe7f2c92 (diff) | |
Bugfix: editing shape keys in edit mode would not work correct
when blending shape keys.
Diffstat (limited to 'source/blender/editors/mesh/editmesh.c')
| -rw-r--r-- | source/blender/editors/mesh/editmesh.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/editors/mesh/editmesh.c b/source/blender/editors/mesh/editmesh.c index 52744c81b7e..b0c51131041 100644 --- a/source/blender/editors/mesh/editmesh.c +++ b/source/blender/editors/mesh/editmesh.c @@ -787,7 +787,6 @@ void make_editMesh(Scene *scene, Object *ob) undo_editmode_clear(); } - /* make editverts */ CustomData_copy(&me->vdata, &em->vdata, CD_MASK_EDITMESH, CD_CALLOC, 0); mvert= me->mvert; @@ -797,10 +796,14 @@ void make_editMesh(Scene *scene, Object *ob) co= mvert->co; + /* edit the shape key coordinate if available */ + if(actkey && a < actkey->totelem) + co= (float*)actkey->data + 3*a; + eve= addvertlist(em, co, NULL); evlist[a]= eve; - // face select sets selection in next loop + /* face select sets selection in next loop */ if(!paint_facesel_test(ob)) eve->f |= (mvert->flag & 1); |