Revision: 23861
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23861
Author:   blendix
Date:     2009-10-15 15:33:56 +0200 (Thu, 15 Oct 2009)

Log Message:
-----------
Bugfix: editing shape keys in edit mode would not work correct
when blending shape keys.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/mesh/editmesh.c

Modified: trunk/blender/source/blender/editors/mesh/editmesh.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh.c        2009-10-15 
11:52:23 UTC (rev 23860)
+++ trunk/blender/source/blender/editors/mesh/editmesh.c        2009-10-15 
13:33:56 UTC (rev 23861)
@@ -787,7 +787,6 @@
                undo_editmode_clear();
        }
 
-       
        /* make editverts */
        CustomData_copy(&me->vdata, &em->vdata, CD_MASK_EDITMESH, CD_CALLOC, 0);
        mvert= me->mvert;
@@ -797,10 +796,14 @@
                
                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);
                


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to