Bugfix: editing shape keys in edit mode would not work correct
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Thu, 15 Oct 2009 13:33:56 +0000 (13:33 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Thu, 15 Oct 2009 13:33:56 +0000 (13:33 +0000)
when blending shape keys.

source/blender/editors/mesh/editmesh.c

index 52744c81b7e2b6315335993a10bf0f010164a49d..b0c5113104138113e9ebd2836ab8d087e5a7382c 100644 (file)
@@ -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);