Cycles: svn merge -r39870:r40266 https://svn.blender.org/svnroot/bf-blender/trunk...
[blender-staging.git] / source / blender / blenkernel / intern / key.c
index b6e4ffd6cc3861f7f501c4685893e02ad8c1af8c..2aef5b39c71866112d4706cb090d37b8a78c0b2b 100644 (file)
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
  * All rights reserved.
  * ***** END GPL LICENSE BLOCK *****
  */
 
+/** \file blender/blenkernel/intern/key.c
+ *  \ingroup bke
+ */
+
+
 #include <math.h>
 #include <string.h>
+#include <stddef.h>
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_blenlib.h"
+#include "BLI_editVert.h"
+#include "BLI_math_vector.h"
+#include "BLI_utildefines.h"
+
 #include "DNA_anim_types.h"
-#include "DNA_curve_types.h"
 #include "DNA_key_types.h"
 #include "DNA_lattice_types.h"
-#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
 #include "BKE_animsys.h"
-#include "BKE_action.h"
-#include "BKE_blender.h"
 #include "BKE_curve.h"
+#include "BKE_customdata.h"
+#include "BKE_deform.h"
 #include "BKE_global.h"
 #include "BKE_key.h"
 #include "BKE_lattice.h"
 #include "BKE_library.h"
-#include "BKE_mesh.h"
 #include "BKE_main.h"
 #include "BKE_object.h"
-#include "BKE_utildefines.h"
-
-#include "BLI_blenlib.h"
+#include "BKE_deform.h"
 
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "RNA_access.h"
 
-#define KEY_BPOINT             1
-#define KEY_BEZTRIPLE  2
+#define KEY_MODE_DUMMY         0 /* use where mode isn't checked for */
+#define KEY_MODE_BPOINT                1
+#define KEY_MODE_BEZTRIPLE     2
 
        // old defines from DNA_ipo_types.h for data-type
 #define IPO_FLOAT              4
@@ -151,14 +156,10 @@ Key *copy_key(Key *key)
        Key *keyn;
        KeyBlock *kbn, *kb;
        
-       if(key==0) return 0;
+       if(key==NULL) return NULL;
        
        keyn= copy_libblock(key);
        
-#if 0 // XXX old animation system
-       keyn->ipo= copy_ipo(key->ipo);
-#endif // XXX old animation system
-       
        BLI_duplicatelist(&keyn->block, &key->block);
        
        kb= key->block.first;
@@ -166,7 +167,7 @@ Key *copy_key(Key *key)
        while(kbn) {
                
                if(kbn->data) kbn->data= MEM_dupallocN(kbn->data);
-               if( kb==key->refkey ) keyn->refkey= kbn;
+               if(kb==key->refkey) keyn->refkey= kbn;
                
                kbn= kbn->next;
                kb= kb->next;
@@ -178,18 +179,14 @@ Key *copy_key(Key *key)
 void make_local_key(Key *key)
 {
 
-    /* - only lib users: do nothing
-    * - only local users: set flag
-    * - mixed: make copy
-    */
-    if(key==0) return;
+       /* - only lib users: do nothing
+       * - only local users: set flag
+       * - mixed: make copy
+       */
+       if(key==NULL) return;
        
-       key->id.lib= 0;
-       new_id(0, (ID *)key, 0);
-
-#if 0 // XXX old animation system
-       make_local_ipo(key->ipo);
-#endif // XXX old animation system
+       key->id.lib= NULL;
+       new_id(NULL, (ID *)key, NULL);
 }
 
 /* Sort shape keys and Ipo curves after a change.  This assumes that at most
@@ -374,14 +371,14 @@ static int setkeys(float fac, ListBase *lb, KeyBlock *k[], float *t, int cycl)
 
        /* if(fac<0.0 || fac>1.0) return 1; */
 
-       if(k1->next==0) return 1;
+       if(k1->next==NULL) return 1;
 
        if(cycl) {      /* pre-sort */
                k[2]= k1->next;
                k[3]= k[2]->next;
-               if(k[3]==0) k[3]=k1;
+               if(k[3]==NULL) k[3]=k1;
                while(k1) {
-                       if(k1->next==0) k[0]=k1;
+                       if(k1->next==NULL) k[0]=k1;
                        k1=k1->next;
                }
                k1= k[1];
@@ -402,13 +399,13 @@ static int setkeys(float fac, ListBase *lb, KeyBlock *k[], float *t, int cycl)
                k[2]= k1->next;
                t[2]= k[2]->pos;
                k[3]= k[2]->next;
-               if(k[3]==0) k[3]= k[2];
+               if(k[3]==NULL) k[3]= k[2];
                t[3]= k[3]->pos;
                k1= k[3];
        }
        
        while( t[2]<fac ) {     /* find correct location */
-               if(k1->next==0) {
+               if(k1->next==NULL) {
                        if(cycl) {
                                k1= firstkey;
                                ofs+= dpos;
@@ -426,7 +423,7 @@ static int setkeys(float fac, ListBase *lb, KeyBlock *k[], float *t, int cycl)
                t[3]= k1->pos+ofs; 
                k[3]= k1;
 
-               if(ofs>2.1+lastpos) break;
+               if(ofs > 2.1f + lastpos) break;
        }
        
        bsplinetype= 0;
@@ -452,7 +449,7 @@ static int setkeys(float fac, ListBase *lb, KeyBlock *k[], float *t, int cycl)
        }
 
        d= t[2]-t[1];
-       if(d==0.0) {
+       if(d == 0.0f) {
                if(bsplinetype==0) {
                        return 1;       /* both keys equal */
                }
@@ -477,66 +474,116 @@ static int setkeys(float fac, ListBase *lb, KeyBlock *k[], float *t, int cycl)
 
 }
 
-static void flerp(int aantal, float *in, float *f0, float *f1, float *f2, float *f3, float *t) 
+static void flerp(int tot, float *in, float *f0, float *f1, float *f2, float *f3, float *t)
 {
        int a;
 
-       for(a=0; a<aantal; a++) {
+       for(a=0; a<tot; a++) {
                in[a]= t[0]*f0[a]+t[1]*f1[a]+t[2]*f2[a]+t[3]*f3[a];
        }
 }
 
-static void rel_flerp(int aantal, float *in, float *ref, float *out, float fac)
+static void rel_flerp(int tot, float *in, float *ref, float *out, float fac)
 {
        int a;
        
-       for(a=0; a<aantal; a++) {
+       for(a=0; a<tot; a++) {
                in[a]-= fac*(ref[a]-out[a]);
        }
 }
 
-static void cp_key(int start, int end, int tot, char *poin, Key *key, KeyBlock *k, float *weights, int mode)
+static char *key_block_get_data(Key *key, KeyBlock *actkb, KeyBlock *kb, char **freedata)
 {
-       float ktot = 0.0, kd = 0.0;
-       int elemsize, poinsize = 0, a, *ofsp, ofs[32], flagflo=0;
-       char *k1, *kref;
-       char *cp, elemstr[8];
+       if(kb == actkb) {
+               /* this hack makes it possible to edit shape keys in
+                  edit mode with shape keys blending applied */
+               if(GS(key->from->name) == ID_ME) {
+                       Mesh *me;
+                       EditVert *eve;
+                       float (*co)[3];
+                       int a;
+
+                       me= (Mesh*)key->from;
+
+                       if(me->edit_mesh && me->edit_mesh->totvert == kb->totelem) {
+                               a= 0;
+                               co= MEM_callocN(sizeof(float)*3*me->edit_mesh->totvert, "key_block_get_data");
+
+                               for(eve=me->edit_mesh->verts.first; eve; eve=eve->next, a++)
+                                       VECCOPY(co[a], eve->co);
+
+                               *freedata= (char*)co;
+                               return (char*)co;
+                       }
+               }
+       }
 
-       if(key->from==NULL) return;
+       *freedata= NULL;
+       return kb->data;
+}
 
-       if( GS(key->from->name)==ID_ME ) {
-               ofs[0]= sizeof(MVert);
-               ofs[1]= 0;
-               poinsize= ofs[0];
-       }
-       else if( GS(key->from->name)==ID_LT ) {
-               ofs[0]= sizeof(BPoint);
-               ofs[1]= 0;
-               poinsize= ofs[0];
+
+/* currently only the first value of 'ofs' may be set. */
+static short key_pointer_size(const Key *key, const int mode, int *poinsize, int *ofs)
+{
+       if(key->from==NULL) {
+               return FALSE;
        }
-       else if( GS(key->from->name)==ID_CU ) {
-               if(mode==KEY_BPOINT) ofs[0]= sizeof(BPoint);
-               else ofs[0]= sizeof(BezTriple);
-               
-               ofs[1]= 0;
-               poinsize= ofs[0];
+
+       switch(GS(key->from->name)) {
+       case ID_ME:
+               *ofs= sizeof(float)*3;
+               *poinsize= *ofs;
+               break;
+       case ID_LT:
+               *ofs= sizeof(float)*3;
+               *poinsize= *ofs;
+               break;
+       case ID_CU:
+               if(mode == KEY_MODE_BPOINT) {
+                       *ofs= sizeof(float)*4;
+                       *poinsize= *ofs;
+               } else {
+                       ofs[0]= sizeof(float)*12;
+                       *poinsize= (*ofs) / 3;
+               }
+
+               break;
+       default:
+               BLI_assert(!"invalid 'key->from' ID type");
+               return FALSE;
        }
 
+       return TRUE;
+}
+
+static void cp_key(const int start, int end, const int tot, char *poin, Key *key, KeyBlock *actkb, KeyBlock *kb, float *weights, const int mode)
+{
+       float ktot = 0.0, kd = 0.0;
+       int elemsize, poinsize = 0, a, *ofsp, ofs[32], flagflo=0;
+       char *k1, *kref, *freek1, *freekref;
+       char *cp, elemstr[8];
+
+       /* currently always 0, in future key_pointer_size may assign */
+       ofs[1]= 0;
+
+       if(!key_pointer_size(key, mode, &poinsize, &ofs[0]))
+               return;
 
        if(end>tot) end= tot;
        
-       k1= k->data;
-       kref= key->refkey->data;
-       
-       if(tot != k->totelem) {
+       if(tot != kb->totelem) {
                ktot= 0.0;
                flagflo= 1;
-               if(k->totelem) {
-                       kd= k->totelem/(float)tot;
+               if(kb->totelem) {
+                       kd= kb->totelem/(float)tot;
                }
                else return;
        }
 
+       k1= key_block_get_data(key, actkb, kb, &freek1);
+       kref= key_block_get_data(key, actkb, key->refkey, &freekref);
+
        /* this exception is needed for slurphing */
        if(start!=0) {
                
@@ -553,7 +600,7 @@ static void cp_key(int start, int end, int tot, char *poin, Key *key, KeyBlock *
                else k1+= start*key->elemsize;
        }       
        
-       if(mode==KEY_BEZTRIPLE) {
+       if(mode == KEY_MODE_BEZTRIPLE) {
                elemstr[0]= 1;
                elemstr[1]= IPO_BEZTRIPLE;
                elemstr[2]= 0;
@@ -561,11 +608,11 @@ static void cp_key(int start, int end, int tot, char *poin, Key *key, KeyBlock *
        
        /* just do it here, not above! */
        elemsize= key->elemsize;
-       if(mode==KEY_BEZTRIPLE) elemsize*= 3;
+       if(mode == KEY_MODE_BEZTRIPLE) elemsize*= 3;
 
        for(a=start; a<end; a++) {
                cp= key->elemstr;
-               if(mode==KEY_BEZTRIPLE) cp= elemstr;
+               if(mode == KEY_MODE_BEZTRIPLE) cp= elemstr;
 
                ofsp= ofs;
                
@@ -573,41 +620,38 @@ static void cp_key(int start, int end, int tot, char *poin, Key *key, KeyBlock *
                        
                        switch(cp[1]) {
                        case IPO_FLOAT:
-                               
                                if(weights) {
-                                       memcpy(poin, kref, sizeof(float)*cp[0]);
+                                       memcpy(poin, kref, sizeof(float)*3);
                                        if(*weights!=0.0f)
                                                rel_flerp(cp[0], (float *)poin, (float *)kref, (float *)k1, *weights);
                                        weights++;
                                }
                                else 
-                                       memcpy(poin, k1, sizeof(float)*cp[0]);
-
-                               poin+= ofsp[0];
-
+                                       memcpy(poin, k1, sizeof(float)*3);
                                break;
                        case IPO_BPOINT:
-                               memcpy(poin, k1, 3*sizeof(float));
-                               memcpy(poin+4*sizeof(float), k1+3*sizeof(float), sizeof(float));
-                               
-                               poin+= ofsp[0];                         
-
+                               memcpy(poin, k1, sizeof(float)*4);
                                break;
                        case IPO_BEZTRIPLE:
-                               memcpy(poin, k1, sizeof(float)*10);
-                               poin+= ofsp[0]; 
-
+                               memcpy(poin, k1, sizeof(float)*12);
                                break;
+                       default:
+                               /* should never happen */
+                               if(freek1) MEM_freeN(freek1);
+                               if(freekref) MEM_freeN(freekref);
+                               BLI_assert(!"invalid 'cp[1]'");
+                               return;
                        }
-                       
+
+                       poin+= ofsp[0]; 
                        cp+= 2; ofsp++;
                }
                
                /* are we going to be nasty? */
                if(flagflo) {
                        ktot+= kd;
-                       while(ktot>=1.0) {
-                               ktot-= 1.0;
+                       while(ktot >= 1.0f) {
+                               ktot -= 1.0f;
                                k1+= elemsize;
                                kref+= elemsize;
                        }
@@ -617,79 +661,57 @@ static void cp_key(int start, int end, int tot, char *poin, Key *key, KeyBlock *
                        kref+= elemsize;
                }
                
-               if(mode==KEY_BEZTRIPLE) a+=2;
+               if(mode == KEY_MODE_BEZTRIPLE) a+=2;
        }
+
+       if(freek1) MEM_freeN(freek1);
+       if(freekref) MEM_freeN(freekref);
 }
 
-void cp_cu_key(Curve *cu, KeyBlock *kb, int start, int end)
+static void cp_cu_key(Curve *cu, Key *key, KeyBlock *actkb, KeyBlock *kb, const int start, int end, char *out, const int tot)
 {
        Nurb *nu;
-       int a, step = 0, tot, a1, a2;
-       char *poin;
+       int a, step, a1, a2;
 
-       tot= count_curveverts(&cu->nurb);
-       nu= cu->nurb.first;
-       a= 0;
-       while(nu) {
+       for(a=0, nu=cu->nurb.first; nu; nu=nu->next, a+=step) {
                if(nu->bp) {
-                       
                        step= nu->pntsu*nu->pntsv;
-                       
-                       /* exception because keys prefer to work with complete blocks */
-                       poin= (char *)nu->bp->vec;
-                       poin -= a*sizeof(BPoint);
-                       
+
                        a1= MAX2(a, start);
                        a2= MIN2(a+step, end);
-                       
-                       if(a1<a2) cp_key(a1, a2, tot, poin, cu->key, kb, NULL, KEY_BPOINT);
+
+                       if(a1<a2) cp_key(a1, a2, tot, out, key, actkb, kb, NULL, KEY_MODE_BPOINT);
                }
                else if(nu->bezt) {
-                       
                        step= 3*nu->pntsu;
-                       
-                       poin= (char *)nu->bezt->vec;
-                       poin -= a*sizeof(BezTriple);
 
+                       /* exception because keys prefer to work with complete blocks */
                        a1= MAX2(a, start);
                        a2= MIN2(a+step, end);
 
-                       if(a1<a2) cp_key(a1, a2, tot, poin, cu->key, kb, NULL, KEY_BEZTRIPLE);
-                       
+                       if(a1<a2) cp_key(a1, a2, tot, out, key, actkb, kb, NULL, KEY_MODE_BEZTRIPLE);
                }
-               a+= step;
-               nu=nu->next;
+               else
+                       step= 0;
        }
 }
 
-
-void do_rel_key(int start, int end, int tot, char *basispoin, Key *key, int mode)
+void do_rel_key(const int start, int end, const int tot, char *basispoin, Key *key, KeyBlock *actkb, const int mode)
 {
        KeyBlock *kb;
        int *ofsp, ofs[3], elemsize, b;
        char *cp, *poin, *reffrom, *from, elemstr[8];
-       
-       if(key->from==NULL) return;
-       
-       if (G.f & G_DEBUG) printf("do_rel_key() \n");
-       
-       if( GS(key->from->name)==ID_ME ) {
-               ofs[0]= sizeof(MVert);
-               ofs[1]= 0;
-       }
-       else if( GS(key->from->name)==ID_LT ) {
-               ofs[0]= sizeof(BPoint);
-               ofs[1]= 0;
-       }
-       else if( GS(key->from->name)==ID_CU ) {
-               if(mode==KEY_BPOINT) ofs[0]= sizeof(BPoint);
-               else ofs[0]= sizeof(BezTriple);
-               
-               ofs[1]= 0;
-       }
-       
+       char *freefrom, *freereffrom;
+       int poinsize;
+
+       /* currently always 0, in future key_pointer_size may assign */
+       ofs[1]= 0;
+
+       if(!key_pointer_size(key, mode, &poinsize, &ofs[0]))
+               return;
+
        if(end>tot) end= tot;
-       
+
        /* in case of beztriple */
        elemstr[0]= 1;                          /* nr of ipofloats */
        elemstr[1]= IPO_BEZTRIPLE;
@@ -697,10 +719,10 @@ void do_rel_key(int start, int end, int tot, char *basispoin, Key *key, int mode
 
        /* just here, not above! */
        elemsize= key->elemsize;
-       if(mode==KEY_BEZTRIPLE) elemsize*= 3;
+       if(mode == KEY_MODE_BEZTRIPLE) elemsize*= 3;
 
        /* step 1 init */
-       cp_key(start, end, tot, basispoin, key, key->refkey, NULL, mode);
+       cp_key(start, end, tot, basispoin, key, actkb, key->refkey, NULL, mode);
        
        /* step 2: do it */
        
@@ -708,23 +730,20 @@ void do_rel_key(int start, int end, int tot, char *basispoin, Key *key, int mode
                if(kb!=key->refkey) {
                        float icuval= kb->curval;
                        
-                       if (G.f & G_DEBUG) printf("\tdo rel key %s : %s = %f \n", key->id.name+2, kb->name, icuval);
-                       
                        /* only with value, and no difference allowed */
                        if(!(kb->flag & KEYBLOCK_MUTE) && icuval!=0.0f && kb->totelem==tot) {
                                KeyBlock *refb;
                                float weight, *weights= kb->weights;
-                               
-                               if (G.f & G_DEBUG) printf("\t\tnot skipped \n");
-                               
-                               poin= basispoin;
-                               from= kb->data;
+
                                /* reference now can be any block */
                                refb= BLI_findlink(&key->block, kb->relative);
                                if(refb==NULL) continue;
-                               reffrom= refb->data;
                                
-                               poin+= start*ofs[0];
+                               poin= basispoin;
+                               from= key_block_get_data(key, actkb, kb, &freefrom);
+                               reffrom= key_block_get_data(key, actkb, refb, &freereffrom);
+                               
+                               poin+= start*poinsize;
                                reffrom+= key->elemsize*start;  // key elemsize yes!
                                from+= key->elemsize*start;
                                
@@ -736,7 +755,7 @@ void do_rel_key(int start, int end, int tot, char *basispoin, Key *key, int mode
                                                weight= icuval;
                                        
                                        cp= key->elemstr;       
-                                       if(mode==KEY_BEZTRIPLE) cp= elemstr;
+                                       if(mode == KEY_MODE_BEZTRIPLE) cp= elemstr;
                                        
                                        ofsp= ofs;
                                        
@@ -744,20 +763,22 @@ void do_rel_key(int start, int end, int tot, char *basispoin, Key *key, int mode
                                                
                                                switch(cp[1]) {
                                                case IPO_FLOAT:
-                                                       rel_flerp(cp[0], (float *)poin, (float *)reffrom, (float *)from, weight);
-                                                       
+                                                       rel_flerp(3, (float *)poin, (float *)reffrom, (float *)from, weight);
                                                        break;
                                                case IPO_BPOINT:
-                                                       rel_flerp(3, (float *)poin, (float *)reffrom, (float *)from, icuval);
-                                                       rel_flerp(1, (float *)(poin+16), (float *)(reffrom+16), (float *)(from+16), icuval);
-                       
+                                                       rel_flerp(4, (float *)poin, (float *)reffrom, (float *)from, weight);
                                                        break;
                                                case IPO_BEZTRIPLE:
-                                                       rel_flerp(9, (float *)poin, (float *)reffrom, (float *)from, icuval);
-                       
+                                                       rel_flerp(12, (float *)poin, (float *)reffrom, (float *)from, weight);
                                                        break;
+                                               default:
+                                                       /* should never happen */
+                                                       if(freefrom) MEM_freeN(freefrom);
+                                                       if(freereffrom) MEM_freeN(freereffrom);
+                                                       BLI_assert(!"invalid 'cp[1]'");
+                                                       return;
                                                }
-                                               
+
                                                poin+= ofsp[0];                         
                                                
                                                cp+= 2;
@@ -767,52 +788,39 @@ void do_rel_key(int start, int end, int tot, char *basispoin, Key *key, int mode
                                        reffrom+= elemsize;
                                        from+= elemsize;
                                        
-                                       if(mode==KEY_BEZTRIPLE) b+= 2;
+                                       if(mode == KEY_MODE_BEZTRIPLE) b+= 2;
                                        if(weights) weights++;
                                }
+
+                               if(freefrom) MEM_freeN(freefrom);
+                               if(freereffrom) MEM_freeN(freereffrom);
                        }
                }
        }
 }
 
 
-static void do_key(int start, int end, int tot, char *poin, Key *key, KeyBlock **k, float *t, int mode)
+static void do_key(const int start, int end, const int tot, char *poin, Key *key, KeyBlock *actkb, KeyBlock **k, float *t, const int mode)
 {
        float k1tot = 0.0, k2tot = 0.0, k3tot = 0.0, k4tot = 0.0;
        float k1d = 0.0, k2d = 0.0, k3d = 0.0, k4d = 0.0;
        int a, ofs[32], *ofsp;
        int flagdo= 15, flagflo=0, elemsize, poinsize=0;
-       char *k1, *k2, *k3, *k4;
+       char *k1, *k2, *k3, *k4, *freek1, *freek2, *freek3, *freek4;
        char *cp, elemstr[8];;
 
-       if(key->from==0) return;
+       /* currently always 0, in future key_pointer_size may assign */
+       ofs[1]= 0;
 
-       if (G.f & G_DEBUG) printf("do_key() \n");
-       
-       if( GS(key->from->name)==ID_ME ) {
-               ofs[0]= sizeof(MVert);
-               ofs[1]= 0;
-               poinsize= ofs[0];
-       }
-       else if( GS(key->from->name)==ID_LT ) {
-               ofs[0]= sizeof(BPoint);
-               ofs[1]= 0;
-               poinsize= ofs[0];
-       }
-       else if( GS(key->from->name)==ID_CU ) {
-               if(mode==KEY_BPOINT) ofs[0]= sizeof(BPoint);
-               else ofs[0]= sizeof(BezTriple);
-               
-               ofs[1]= 0;
-               poinsize= ofs[0];
-       }
+       if(!key_pointer_size(key, mode, &poinsize, &ofs[0]))
+               return;
        
        if(end>tot) end= tot;
 
-       k1= k[0]->data;
-       k2= k[1]->data;
-       k3= k[2]->data;
-       k4= k[3]->data;
+       k1= key_block_get_data(key, actkb, k[0], &freek1);
+       k2= key_block_get_data(key, actkb, k[1], &freek2);
+       k3= key_block_get_data(key, actkb, k[2], &freek3);
+       k4= key_block_get_data(key, actkb, k[3], &freek4);
 
        /*  test for more or less points (per key!) */
        if(tot != k[0]->totelem) {
@@ -907,12 +915,12 @@ static void do_key(int start, int end, int tot, char *poin, Key *key, KeyBlock *
 
        /* only here, not above! */
        elemsize= key->elemsize;
-       if(mode==KEY_BEZTRIPLE) elemsize*= 3;
+       if(mode == KEY_MODE_BEZTRIPLE) elemsize*= 3;
 
        for(a=start; a<end; a++) {
        
                cp= key->elemstr;       
-               if(mode==KEY_BEZTRIPLE) cp= elemstr;
+               if(mode == KEY_MODE_BEZTRIPLE) cp= elemstr;
                
                ofsp= ofs;
                
@@ -920,26 +928,25 @@ static void do_key(int start, int end, int tot, char *poin, Key *key, KeyBlock *
                        
                        switch(cp[1]) {
                        case IPO_FLOAT:
-                               flerp(cp[0], (float *)poin, (float *)k1, (float *)k2, (float *)k3, (float *)k4, t);
-                               poin+= ofsp[0];                         
-
+                               flerp(3, (float *)poin, (float *)k1, (float *)k2, (float *)k3, (float *)k4, t);
                                break;
                        case IPO_BPOINT:
-                               flerp(3, (float *)poin, (float *)k1, (float *)k2, (float *)k3, (float *)k4, t);
-                               flerp(1, (float *)(poin+16), (float *)(k1+12), (float *)(k2+12), (float *)(k3+12), (float *)(k4+12), t);
-                               
-                               poin+= ofsp[0];                         
-
+                               flerp(4, (float *)poin, (float *)k1, (float *)k2, (float *)k3, (float *)k4, t);
                                break;
                        case IPO_BEZTRIPLE:
-                               flerp(9, (void *)poin, (void *)k1, (void *)k2, (void *)k3, (void *)k4, t);
-                               flerp(1, (float *)(poin+36), (float *)(k1+36), (float *)(k2+36), (float *)(k3+36), (float *)(k4+36), t);
-                               poin+= ofsp[0];                         
-
+                               flerp(12, (void *)poin, (void *)k1, (void *)k2, (void *)k3, (void *)k4, t);
                                break;
+                       default:
+                               /* should never happen */
+                               if(freek1) MEM_freeN(freek1);
+                               if(freek2) MEM_freeN(freek2);
+                               if(freek3) MEM_freeN(freek3);
+                               if(freek4) MEM_freeN(freek4);
+                               BLI_assert(!"invalid 'cp[1]'");
+                               return;
                        }
                        
-
+                       poin+= ofsp[0];                         
                        cp+= 2;
                        ofsp++;
                }
@@ -947,8 +954,8 @@ static void do_key(int start, int end, int tot, char *poin, Key *key, KeyBlock *
                if(flagdo & 1) {
                        if(flagflo & 1) {
                                k1tot+= k1d;
-                               while(k1tot>=1.0) {
-                                       k1tot-= 1.0;
+                               while(k1tot >= 1.0f) {
+                                       k1tot -= 1.0f;
                                        k1+= elemsize;
                                }
                        }
@@ -957,8 +964,8 @@ static void do_key(int start, int end, int tot, char *poin, Key *key, KeyBlock *
                if(flagdo & 2) {
                        if(flagflo & 2) {
                                k2tot+= k2d;
-                               while(k2tot>=1.0) {
-                                       k2tot-= 1.0;
+                               while(k2tot >= 1.0f) {
+                                       k2tot -= 1.0f;
                                        k2+= elemsize;
                                }
                        }
@@ -967,8 +974,8 @@ static void do_key(int start, int end, int tot, char *poin, Key *key, KeyBlock *
                if(flagdo & 4) {
                        if(flagflo & 4) {
                                k3tot+= k3d;
-                               while(k3tot>=1.0) {
-                                       k3tot-= 1.0;
+                               while(k3tot >= 1.0f) {
+                                       k3tot -= 1.0f;
                                        k3+= elemsize;
                                }
                        }
@@ -977,23 +984,29 @@ static void do_key(int start, int end, int tot, char *poin, Key *key, KeyBlock *
                if(flagdo & 8) {
                        if(flagflo & 8) {
                                k4tot+= k4d;
-                               while(k4tot>=1.0) {
-                                       k4tot-= 1.0;
+                               while(k4tot >= 1.0f) {
+                                       k4tot -= 1.0f;
                                        k4+= elemsize;
                                }
                        }
                        else k4+= elemsize;
                }
                
-               if(mode==KEY_BEZTRIPLE) a+= 2;
+               if(mode == KEY_MODE_BEZTRIPLE) a+= 2;
        }
+
+       if(freek1) MEM_freeN(freek1);
+       if(freek2) MEM_freeN(freek2);
+       if(freek3) MEM_freeN(freek3);
+       if(freek4) MEM_freeN(freek4);
 }
 
 static float *get_weights_array(Object *ob, char *vgroup)
 {
-       bDeformGroup *curdef;
        MDeformVert *dvert= NULL;
-       int totvert= 0, index= 0;
+       EditMesh *em= NULL;
+       EditVert *eve;
+       int totvert= 0, defgrp_index= 0;
        
        /* no vgroup string set? */
        if(vgroup[0]==0) return NULL;
@@ -1003,6 +1016,9 @@ static float *get_weights_array(Object *ob, char *vgroup)
                Mesh *me= ob->data;
                dvert= me->dvert;
                totvert= me->totvert;
+
+               if(me->edit_mesh && me->edit_mesh->totvert == totvert)
+                       em= me->edit_mesh;
        }
        else if(ob->type==OB_LATTICE) {
                Lattice *lt= ob->data;
@@ -1013,64 +1029,57 @@ static float *get_weights_array(Object *ob, char *vgroup)
        if(dvert==NULL) return NULL;
        
        /* find the group (weak loop-in-loop) */
-       for (curdef = ob->defbase.first; curdef; curdef=curdef->next, index++)
-               if (!strcmp(curdef->name, vgroup))
-                       break;
-
-       if(curdef) {
+       defgrp_index= defgroup_name_index(ob, vgroup);
+       if(defgrp_index >= 0) {
                float *weights;
-               int i, j;
+               int i;
                
                weights= MEM_callocN(totvert*sizeof(float), "weights");
-               
-               for (i=0; i < totvert; i++, dvert++) {
-                       for(j=0; j<dvert->totweight; j++) {
-                               if (dvert->dw[j].def_nr == index) {
-                                       weights[i]= dvert->dw[j].weight;
-                                       break;
+
+               if(em) {
+                       for(i=0, eve=em->verts.first; eve; eve=eve->next, i++) {
+                               dvert= CustomData_em_get(&em->vdata, eve->data, CD_MDEFORMVERT);
+
+                               if(dvert) {
+                                       weights[i]= defvert_find_weight(dvert, defgrp_index);
                                }
                        }
                }
+               else {
+                       for(i=0; i < totvert; i++, dvert++) {
+                               weights[i]= defvert_find_weight(dvert, defgrp_index);
+                       }
+               }
+
                return weights;
        }
        return NULL;
 }
 
-static int do_mesh_key(Scene *scene, Object *ob, Mesh *me)
+static void do_mesh_key(Scene *scene, Object *ob, Key *key, char *out, const int tot)
 {
-       KeyBlock *k[4];
-       float cfra, ctime, t[4], delta, loc[3], size[3];
+       KeyBlock *k[4], *actkb= ob_get_keyblock(ob);
+       float cfra, ctime, t[4], delta;
        int a, flag = 0, step;
        
-       if(me->totvert==0) return 0;
-       if(me->key==NULL) return 0;
-       if(me->key->block.first==NULL) return 0;
-       
-       /* prevent python from screwing this up? anyhoo, the from pointer could be dropped */
-       me->key->from= (ID *)me;
-       
-       if (G.f & G_DEBUG) printf("do mesh key ob:%s me:%s ke:%s \n", ob->id.name+2, me->id.name+2, me->key->id.name+2);
-       
-       if(me->key->slurph && me->key->type!=KEY_RELATIVE ) {
-               if (G.f & G_DEBUG) printf("\tslurph key\n");
-               
-               delta= me->key->slurph;
-               delta/= me->totvert;
+       if(key->slurph && key->type!=KEY_RELATIVE ) {
+               delta= key->slurph;
+               delta/= tot;
                
                step= 1;
-               if(me->totvert>100 && slurph_opt) {
-                       step= me->totvert/50;
+               if(tot>100 && slurph_opt) {
+                       step= tot/50;
                        delta*= step;
                        /* in do_key and cp_key the case a>tot is handled */
                }
                
                cfra= (float)scene->r.cfra;
                
-               for(a=0; a<me->totvert; a+=step, cfra+= delta) {
+               for(a=0; a<tot; a+=step, cfra+= delta) {
                        
-                       ctime= bsystem_time(scene, 0, cfra, 0.0); // xxx  ugly cruft!
+                       ctime= bsystem_time(scene, NULL, cfra, 0.0); // xxx  ugly cruft!
 #if 0 // XXX old animation system
-                       if(calc_ipo_spec(me->key->ipo, KEY_SPEED, &ctime)==0) {
+                       if(calc_ipo_spec(key->ipo, KEY_SPEED, &ctime)==0) {
                                ctime /= 100.0;
                                CLAMP(ctime, 0.0, 1.0);
                        }
@@ -1079,42 +1088,33 @@ static int do_mesh_key(Scene *scene, Object *ob, Mesh *me)
                        ctime /= 100.0f;
                        CLAMP(ctime, 0.0f, 1.0f); // XXX for compat, we use this, but this clamping was confusing
                
-                       flag= setkeys(ctime, &me->key->block, k, t, 0);
-                       if(flag==0) {
-                               
-                               do_key(a, a+step, me->totvert, (char *)me->mvert->co, me->key, k, t, 0);
-                       }
-                       else {
-                               cp_key(a, a+step, me->totvert, (char *)me->mvert->co, me->key, k[2], NULL, 0);
-                       }
+                       flag= setkeys(ctime, &key->block, k, t, 0);
+
+                       if(flag==0)
+                               do_key(a, a+step, tot, (char *)out, key, actkb, k, t, KEY_MODE_DUMMY);
+                       else
+                               cp_key(a, a+step, tot, (char *)out, key, actkb, k[2], NULL, KEY_MODE_DUMMY);
                }
-               
-               if(flag && k[2]==me->key->refkey) tex_space_mesh(me);
-               else boundbox_mesh(me, loc, size);
        }
        else {
-               if(me->key->type==KEY_RELATIVE) {
+               if(key->type==KEY_RELATIVE) {
                        KeyBlock *kb;
                        
-                       if (G.f & G_DEBUG) printf("\tdo relative \n");
-                       
-                       for(kb= me->key->block.first; kb; kb= kb->next)
+                       for(kb= key->block.first; kb; kb= kb->next)
                                kb->weights= get_weights_array(ob, kb->vgroup);
 
-                       do_rel_key(0, me->totvert, me->totvert, (char *)me->mvert->co, me->key, 0);
+                       do_rel_key(0, tot, tot, (char *)out, key, actkb, KEY_MODE_DUMMY);
                        
-                       for(kb= me->key->block.first; kb; kb= kb->next) {
+                       for(kb= key->block.first; kb; kb= kb->next) {
                                if(kb->weights) MEM_freeN(kb->weights);
                                kb->weights= NULL;
                        }
                }
                else {
-                       if (G.f & G_DEBUG) printf("\tdo absolute \n");
-                       
                        ctime= bsystem_time(scene, ob, (float)scene->r.cfra, 0.0f); // xxx old cruft
                        
 #if 0 // XXX old animation system
-                       if(calc_ipo_spec(me->key->ipo, KEY_SPEED, &ctime)==0) {
+                       if(calc_ipo_spec(key->ipo, KEY_SPEED, &ctime)==0) {
                                ctime /= 100.0;
                                CLAMP(ctime, 0.0, 1.0);
                        }
@@ -1123,256 +1123,261 @@ static int do_mesh_key(Scene *scene, Object *ob, Mesh *me)
                        ctime /= 100.0f;
                        CLAMP(ctime, 0.0f, 1.0f); // XXX for compat, we use this, but this clamping was confusing
                        
-                       flag= setkeys(ctime, &me->key->block, k, t, 0);
-                       if(flag==0) {
-                               do_key(0, me->totvert, me->totvert, (char *)me->mvert->co, me->key, k, t, 0);
-                       }
-                       else {
-                               cp_key(0, me->totvert, me->totvert, (char *)me->mvert->co, me->key, k[2], NULL, 0);
-                       }
-                       
-                       if(flag && k[2]==me->key->refkey) tex_space_mesh(me);
-                       else boundbox_mesh(me, loc, size);
+                       flag= setkeys(ctime, &key->block, k, t, 0);
+
+                       if(flag==0)
+                               do_key(0, tot, tot, (char *)out, key, actkb, k, t, KEY_MODE_DUMMY);
+                       else
+                               cp_key(0, tot, tot, (char *)out, key, actkb, k[2], NULL, KEY_MODE_DUMMY);
                }
        }
-       return 1;
 }
 
-static void do_cu_key(Curve *cu, KeyBlock **k, float *t)
+static void do_cu_key(Curve *cu, Key *key, KeyBlock *actkb, KeyBlock **k, float *t, char *out, const int tot)
 {
        Nurb *nu;
-       int a, step = 0, tot;
-       char *poin;
+       int a, step;
        
-       tot= count_curveverts(&cu->nurb);
-       nu= cu->nurb.first;
-       a= 0;
-       
-       while(nu) {
+       for(a=0, nu=cu->nurb.first; nu; nu=nu->next, a+=step) {
                if(nu->bp) {
-                       
                        step= nu->pntsu*nu->pntsv;
-                       
-                       /* exception because keys prefer to work with complete blocks */
-                       poin= (char *)nu->bp->vec;
-                       poin -= a*sizeof(BPoint);
-                       
-                       do_key(a, a+step, tot, poin, cu->key, k, t, KEY_BPOINT);
+                       do_key(a, a+step, tot, out, key, actkb, k, t, KEY_MODE_BPOINT);
                }
                else if(nu->bezt) {
-                       
                        step= 3*nu->pntsu;
-                       
-                       poin= (char *)nu->bezt->vec;
-                       poin -= a*sizeof(BezTriple);
-
-                       do_key(a, a+step, tot, poin, cu->key, k, t, KEY_BEZTRIPLE);
-                       
+                       do_key(a, a+step, tot, out, key, actkb, k, t, KEY_MODE_BEZTRIPLE);
                }
-               a+= step;
-               nu=nu->next;
+               else
+                       step= 0;
        }
 }
 
-static void do_rel_cu_key(Curve *cu, float ctime)
+static void do_rel_cu_key(Curve *cu, Key *key, KeyBlock *actkb, float UNUSED(ctime), char *out, const int tot)
 {
        Nurb *nu;
-       int a, step = 0, tot;
-       char *poin;
+       int a, step;
        
-       tot= count_curveverts(&cu->nurb);
-       nu= cu->nurb.first;
-       a= 0;
-       while(nu) {
+       for(a=0, nu=cu->nurb.first; nu; nu=nu->next, a+=step) {
                if(nu->bp) {
-                       
                        step= nu->pntsu*nu->pntsv;
-                       
-                       /* exception because keys prefer to work with complete blocks */
-                       poin= (char *)nu->bp->vec;
-                       poin -= a*sizeof(BPoint);
-                       
-                       do_rel_key(a, a+step, tot, poin, cu->key, KEY_BPOINT);
+                       do_rel_key(a, a+step, tot, out, key, actkb, KEY_MODE_BPOINT);
                }
                else if(nu->bezt) {
-                       
                        step= 3*nu->pntsu;
-                       
-                       poin= (char *)nu->bezt->vec;
-                       poin -= a*sizeof(BezTriple);
-
-                       do_rel_key(a, a+step, tot, poin, cu->key, KEY_BEZTRIPLE);
+                       do_rel_key(a, a+step, tot, out, key, actkb, KEY_MODE_BEZTRIPLE);
                }
-               a+= step;
-               
-               nu=nu->next;
+               else
+                       step= 0;
        }
 }
 
-static int do_curve_key(Scene *scene, Curve *cu)
+static void do_curve_key(Scene *scene, Object *ob, Key *key, char *out, const int tot)
 {
-       KeyBlock *k[4];
+       Curve *cu= ob->data;
+       KeyBlock *k[4], *actkb= ob_get_keyblock(ob);
        float cfra, ctime, t[4], delta;
-       int a, flag = 0, step = 0, tot;
-       
-       tot= count_curveverts(&cu->nurb);
-       
-       if(tot==0) return 0;
-       if(cu->key==NULL) return 0;
-       if(cu->key->block.first==NULL) return 0;
-       
-       if(cu->key->slurph) {
-               delta= cu->key->slurph;
-               delta/= tot;
-               
+       int a, flag = 0, step = 0;
+
+       if(key->slurph  && key->type!=KEY_RELATIVE) {
+               Nurb *nu;
+               int mode=0, i= 0, remain= 0, estep=0, count=0;
+
+               delta= (float)key->slurph / tot;
+
                step= 1;
                if(tot>100 && slurph_opt) {
                        step= tot/50;
                        delta*= step;
                        /* in do_key and cp_key the case a>tot has been handled */
                }
-               
+
                cfra= (float)scene->r.cfra;
-               
-               for(a=0; a<tot; a+=step, cfra+= delta) {
-                       ctime= bsystem_time(scene, 0, cfra, 0.0f); // XXX old cruft
-#if 0 // XXX old animation system
-                       if(calc_ipo_spec(cu->key->ipo, KEY_SPEED, &ctime)==0) {
-                               ctime /= 100.0;
-                               CLAMP(ctime, 0.0, 1.0);
+
+               for(nu=cu->nurb.first; nu; nu=nu->next) {
+                       if(nu->bp) {
+                               mode= KEY_MODE_BPOINT;
+                               estep= nu->pntsu*nu->pntsv;
                        }
-#endif // XXX old animation system
-               
-                       flag= setkeys(ctime, &cu->key->block, k, t, 0);
-                       if(flag==0) {
-                               
-                               /* do_key(a, a+step, tot, (char *)cu->mvert->co, cu->key, k, t, 0); */
+                       else if(nu->bezt) {
+                               mode= KEY_MODE_BEZTRIPLE;
+                               estep= 3*nu->pntsu;
                        }
-                       else {
-                               /* cp_key(a, a+step, tot, (char *)cu->mvert->co, cu->key, k[2],0); */
+                       else
+                               step= 0;
+
+                       a= 0;
+                       while (a < estep) {
+                               if (remain <= 0) {
+                                       cfra+= delta;
+                                       ctime= bsystem_time(scene, NULL, cfra, 0.0f); // XXX old cruft
+
+                                       ctime /= 100.0f;
+                                       CLAMP(ctime, 0.0f, 1.0f); // XXX for compat, we use this, but this clamping was confusing
+                                       flag= setkeys(ctime, &key->block, k, t, 0);
+
+                                       remain= step;
+                               }
+
+                               count= MIN2(remain, estep);
+                               if (mode == KEY_MODE_BEZTRIPLE) {
+                                       count += 3 - count % 3;
+                               }
+
+                               if(flag==0)
+                                       do_key(i, i+count, tot, (char *)out, key, actkb, k, t, mode);
+                               else
+                                       cp_key(i, i+count, tot, (char *)out, key, actkb, k[2], NULL, mode);
+
+                               a += count;
+                               i += count;
+                               remain -= count;
                        }
                }
-
-               if(flag && k[2]==cu->key->refkey) tex_space_curve(cu);
-               
-               
        }
        else {
                
                ctime= bsystem_time(scene, NULL, (float)scene->r.cfra, 0.0);
                
-               if(cu->key->type==KEY_RELATIVE) {
-                       do_rel_cu_key(cu, ctime);
+               if(key->type==KEY_RELATIVE) {
+                       do_rel_cu_key(cu, cu->key, actkb, ctime, out, tot);
                }
                else {
 #if 0 // XXX old animation system
-                       if(calc_ipo_spec(cu->key->ipo, KEY_SPEED, &ctime)==0) {
+                       if(calc_ipo_spec(key->ipo, KEY_SPEED, &ctime)==0) {
                                ctime /= 100.0;
                                CLAMP(ctime, 0.0, 1.0);
                        }
 #endif // XXX old animation system
                        
-                       flag= setkeys(ctime, &cu->key->block, k, t, 0);
+                       flag= setkeys(ctime, &key->block, k, t, 0);
                        
-                       if(flag==0) do_cu_key(cu, k, t);
-                       else cp_cu_key(cu, k[2], 0, tot);
-                                       
-                       if(flag && k[2]==cu->key->refkey) tex_space_curve(cu);
+                       if(flag==0) do_cu_key(cu, key, actkb, k, t, out, tot);
+                       else cp_cu_key(cu, key, actkb, k[2], 0, tot, out, tot);
                }
        }
-       
-       return 1;
 }
 
-static int do_latt_key(Scene *scene, Object *ob, Lattice *lt)
+static void do_latt_key(Scene *scene, Object *ob, Key *key, char *out, const int tot)
 {
-       KeyBlock *k[4];
+       Lattice *lt= ob->data;
+       KeyBlock *k[4], *actkb= ob_get_keyblock(ob);
        float delta, cfra, ctime, t[4];
-       int a, tot, flag;
+       int a, flag;
        
-       if(lt->key==NULL) return 0;
-       if(lt->key->block.first==NULL) return 0;
-
-       tot= lt->pntsu*lt->pntsv*lt->pntsw;
-
-       if(lt->key->slurph) {
-               delta= lt->key->slurph;
+       if(key->slurph) {
+               delta= key->slurph;
                delta/= (float)tot;
                
                cfra= (float)scene->r.cfra;
                
                for(a=0; a<tot; a++, cfra+= delta) {
                        
-                       ctime= bsystem_time(scene, 0, cfra, 0.0); // XXX old cruft
+                       ctime= bsystem_time(scene, NULL, cfra, 0.0); // XXX old cruft
 #if 0 // XXX old animation system
-                       if(calc_ipo_spec(lt->key->ipo, KEY_SPEED, &ctime)==0) {
+                       if(calc_ipo_spec(key->ipo, KEY_SPEED, &ctime)==0) {
                                ctime /= 100.0;
                                CLAMP(ctime, 0.0, 1.0);
                        }
 #endif // XXX old animation system
                
-                       flag= setkeys(ctime, &lt->key->block, k, t, 0);
-                       if(flag==0) {
-                               
-                               do_key(a, a+1, tot, (char *)lt->def->vec, lt->key, k, t, 0);
-                       }
-                       else {
-                               cp_key(a, a+1, tot, (char *)lt->def->vec, lt->key, k[2], NULL, 0);
-                       }
+                       flag= setkeys(ctime, &key->block, k, t, 0);
+
+                       if(flag==0)
+                               do_key(a, a+1, tot, (char *)out, key, actkb, k, t, KEY_MODE_DUMMY);
+                       else
+                               cp_key(a, a+1, tot, (char *)out, key, actkb, k[2], NULL, KEY_MODE_DUMMY);
                }               
        }
        else {
-               ctime= bsystem_time(scene, NULL, (float)scene->r.cfra, 0.0);
-       
-               if(lt->key->type==KEY_RELATIVE) {
+               if(key->type==KEY_RELATIVE) {
                        KeyBlock *kb;
                        
-                       for(kb= lt->key->block.first; kb; kb= kb->next)
+                       for(kb= key->block.first; kb; kb= kb->next)
                                kb->weights= get_weights_array(ob, kb->vgroup);
                        
-                       do_rel_key(0, tot, tot, (char *)lt->def->vec, lt->key, 0);
+                       do_rel_key(0, tot, tot, (char *)out, key, actkb, KEY_MODE_DUMMY);
                        
-                       for(kb= lt->key->block.first; kb; kb= kb->next) {
+                       for(kb= key->block.first; kb; kb= kb->next) {
                                if(kb->weights) MEM_freeN(kb->weights);
                                kb->weights= NULL;
                        }
                }
                else {
+                       ctime= bsystem_time(scene, NULL, (float)scene->r.cfra, 0.0);
+
 #if 0 // XXX old animation system
-                       if(calc_ipo_spec(lt->key->ipo, KEY_SPEED, &ctime)==0) {
+                       if(calc_ipo_spec(key->ipo, KEY_SPEED, &ctime)==0) {
                                ctime /= 100.0;
                                CLAMP(ctime, 0.0, 1.0);
                        }
 #endif // XXX old animation system
                        
-                       flag= setkeys(ctime, &lt->key->block, k, t, 0);
-                       if(flag==0) {
-                               do_key(0, tot, tot, (char *)lt->def->vec, lt->key, k, t, 0);
-                       }
-                       else {
-                               cp_key(0, tot, tot, (char *)lt->def->vec, lt->key, k[2], NULL, 0);
-                       }
+                       flag= setkeys(ctime, &key->block, k, t, 0);
+
+                       if(flag==0)
+                               do_key(0, tot, tot, (char *)out, key, actkb, k, t, KEY_MODE_DUMMY);
+                       else
+                               cp_key(0, tot, tot, (char *)out, key, actkb, k[2], NULL, KEY_MODE_DUMMY);
                }
        }
        
        if(lt->flag & LT_OUTSIDE) outside_lattice(lt);
-       
-       return 1;
 }
 
-/* returns 1 when key applied */
-int do_ob_key(Scene *scene, Object *ob)
+/* returns key coordinates (+ tilt) when key applied, NULL otherwise */
+float *do_ob_key(Scene *scene, Object *ob)
 {
        Key *key= ob_get_key(ob);
+       KeyBlock *actkb= ob_get_keyblock(ob);
+       char *out;
+       int tot= 0, size= 0;
        
-       if(key==NULL)
-               return 0;
+       if(key==NULL || key->block.first==NULL)
+               return NULL;
+
+       /* compute size of output array */
+       if(ob->type == OB_MESH) {
+               Mesh *me= ob->data;
+
+               tot= me->totvert;
+               size= tot*3*sizeof(float);
+       }
+       else if(ob->type == OB_LATTICE) {
+               Lattice *lt= ob->data;
+
+               tot= lt->pntsu*lt->pntsv*lt->pntsw;
+               size= tot*3*sizeof(float);
+       }
+       else if(ELEM(ob->type, OB_CURVE, OB_SURF)) {
+               Curve *cu= ob->data;
+               Nurb *nu;
+
+               for(nu=cu->nurb.first; nu; nu=nu->next) {
+                       if(nu->bezt) {
+                               tot += 3*nu->pntsu;
+                               size += nu->pntsu*12*sizeof(float);
+                       }
+                       else if(nu->bp) {
+                               tot += nu->pntsu*nu->pntsv;
+                               size += nu->pntsu*nu->pntsv*12*sizeof(float);
+                       }
+               }
+       }
+
+       /* if nothing to interpolate, cancel */
+       if(tot == 0 || size == 0)
+               return NULL;
+       
+       /* allocate array */
+       out= MEM_callocN(size, "do_ob_key out");
+
+       /* prevent python from screwing this up? anyhoo, the from pointer could be dropped */
+       key->from= (ID *)ob->data;
                
        if(ob->shapeflag & OB_SHAPE_LOCK) {
+               /* shape locked, copy the locked shape instead of blending */
                KeyBlock *kb= BLI_findlink(&key->block, ob->shapenr-1);
                
-               if (G.f & G_DEBUG) printf("ob %s, key %s locked \n", ob->id.name+2, key->id.name+2);
-               
                if(kb && (kb->flag & KEYBLOCK_MUTE))
                        kb= key->refkey;
 
@@ -1381,46 +1386,29 @@ int do_ob_key(Scene *scene, Object *ob)
                        ob->shapenr= 1;
                }
                
-               if(ob->type==OB_MESH) {
-                       Mesh *me= ob->data;
+               if(ELEM(ob->type, OB_MESH, OB_LATTICE)) {
                        float *weights= get_weights_array(ob, kb->vgroup);
 
-                       cp_key(0, me->totvert, me->totvert, (char *)me->mvert->co, key, kb, weights, 0);
-                       
-                       if(weights) MEM_freeN(weights);
-               }
-               else if(ob->type==OB_LATTICE) {
-                       Lattice *lt= ob->data;
-                       float *weights= get_weights_array(ob, kb->vgroup);
-                       int tot= lt->pntsu*lt->pntsv*lt->pntsw;
-                       
-                       cp_key(0, tot, tot, (char *)lt->def->vec, key, kb, weights, 0);
-                       
+                       cp_key(0, tot, tot, (char*)out, key, actkb, kb, weights, 0);
+
                        if(weights) MEM_freeN(weights);
                }
-               else if ELEM(ob->type, OB_CURVE, OB_SURF) {
-                       Curve *cu= ob->data;
-                       int tot= count_curveverts(&cu->nurb);
-                       
-                       cp_cu_key(cu, kb, 0, tot);
-               }
-               return 1;
+               else if(ELEM(ob->type, OB_CURVE, OB_SURF))
+                       cp_cu_key(ob->data, key, actkb, kb, 0, tot, out, tot);
        }
        else {
                /* do shapekey local drivers */
                float ctime= (float)scene->r.cfra; // XXX this needs to be checked
                
-               if (G.f & G_DEBUG) 
-                       printf("ob %s - do shapekey (%s) drivers \n", ob->id.name+2, key->id.name+2);
-               BKE_animsys_evaluate_animdata(&key->id, key->adt, ctime, ADT_RECALC_DRIVERS);
+               BKE_animsys_evaluate_animdata(scene, &key->id, key->adt, ctime, ADT_RECALC_DRIVERS);
                
-               if(ob->type==OB_MESH) return do_mesh_key(scene, ob, ob->data);
-               else if(ob->type==OB_CURVE) return do_curve_key(scene, ob->data);
-               else if(ob->type==OB_SURF) return do_curve_key(scene, ob->data);
-               else if(ob->type==OB_LATTICE) return do_latt_key(scene, ob, ob->data);
+               if(ob->type==OB_MESH) do_mesh_key(scene, ob, key, out, tot);
+               else if(ob->type==OB_LATTICE) do_latt_key(scene, ob, key, out, tot);
+               else if(ob->type==OB_CURVE) do_curve_key(scene, ob, key, out, tot);
+               else if(ob->type==OB_SURF) do_curve_key(scene, ob, key, out, tot);
        }
        
-       return 0;
+       return (float*)out;
 }
 
 Key *ob_get_key(Object *ob)
@@ -1442,6 +1430,55 @@ Key *ob_get_key(Object *ob)
        return NULL;
 }
 
+KeyBlock *add_keyblock(Key *key, const char *name)
+{
+       KeyBlock *kb;
+       float curpos= -0.1;
+       int tot;
+       
+       kb= key->block.last;
+       if(kb) curpos= kb->pos;
+       
+       kb= MEM_callocN(sizeof(KeyBlock), "Keyblock");
+       BLI_addtail(&key->block, kb);
+       kb->type= KEY_CARDINAL;
+       
+       tot= BLI_countlist(&key->block);
+       if(name) {
+               strncpy(kb->name, name, sizeof(kb->name));
+       } else {
+               if(tot==1) strcpy(kb->name, "Basis");
+               else sprintf(kb->name, "Key %d", tot-1);
+       }
+
+       BLI_uniquename(&key->block, kb, "Key", '.', offsetof(KeyBlock, name), sizeof(kb->name));
+
+       // XXX this is old anim system stuff? (i.e. the 'index' of the shapekey)
+       kb->adrcode= tot-1;
+       
+       key->totkey++;
+       if(key->totkey==1) key->refkey= kb;
+       
+       kb->slidermin= 0.0f;
+       kb->slidermax= 1.0f;
+       
+       // XXX kb->pos is the confusing old horizontal-line RVK crap in old IPO Editor...
+       if(key->type == KEY_RELATIVE) 
+               kb->pos= curpos + 0.1f;
+       else {
+#if 0 // XXX old animation system
+               curpos= bsystem_time(scene, 0, (float)CFRA, 0.0);
+               if(calc_ipo_spec(key->ipo, KEY_SPEED, &curpos)==0) {
+                       curpos /= 100.0;
+               }
+               kb->pos= curpos;
+               
+               sort_keys(key);
+#endif // XXX old animation system
+       }
+       return kb;
+}
+
 /* only the active keyblock */
 KeyBlock *ob_get_keyblock(Object *ob) 
 {
@@ -1455,6 +1492,16 @@ KeyBlock *ob_get_keyblock(Object *ob)
        return NULL;
 }
 
+KeyBlock *ob_get_reference_keyblock(Object *ob)
+{
+       Key *key= ob_get_key(ob);
+       
+       if (key)
+               return key->refkey;
+
+       return NULL;
+}
+
 /* get the appropriate KeyBlock given an index */
 KeyBlock *key_get_keyblock(Key *key, int index)
 {
@@ -1478,14 +1525,413 @@ KeyBlock *key_get_keyblock(Key *key, int index)
 /* get the appropriate KeyBlock given a name to search for */
 KeyBlock *key_get_named_keyblock(Key *key, const char name[])
 {
-       KeyBlock *kb;
+       if (key && name)
+               return BLI_findstring(&key->block, name, offsetof(KeyBlock, name));
        
-       if (key && name) {
-               for (kb= key->block.first; kb; kb= kb->next) {
-                       if (strcmp(name, kb->name)==0)
-                               return kb;
+       return NULL;
+}
+
+/* Get RNA-Path for 'value' setting of the given ShapeKey 
+ * NOTE: the user needs to free the returned string once they're finishe with it
+ */
+char *key_get_curValue_rnaPath(Key *key, KeyBlock *kb)
+{
+       PointerRNA ptr;
+       PropertyRNA *prop;
+       
+       /* sanity checks */
+       if ELEM(NULL, key, kb)
+               return NULL;
+       
+       /* create the RNA pointer */
+       RNA_pointer_create(&key->id, &RNA_ShapeKey, kb, &ptr);
+       /* get pointer to the property too */
+       prop= RNA_struct_find_property(&ptr, "value");
+       
+       /* return the path */
+       return RNA_path_from_ID_to_property(&ptr, prop);
+}
+
+
+/* conversion functions */
+
+/************************* Lattice ************************/
+void latt_to_key(Lattice *lt, KeyBlock *kb)
+{
+       BPoint *bp;
+       float *fp;
+       int a, tot;
+
+       tot= lt->pntsu*lt->pntsv*lt->pntsw;
+       if(tot==0) return;
+
+       if(kb->data) MEM_freeN(kb->data);
+
+       kb->data= MEM_callocN(lt->key->elemsize*tot, "kb->data");
+       kb->totelem= tot;
+
+       bp= lt->def;
+       fp= kb->data;
+       for(a=0; a<kb->totelem; a++, fp+=3, bp++) {
+               VECCOPY(fp, bp->vec);
+       }
+}
+
+void key_to_latt(KeyBlock *kb, Lattice *lt)
+{
+       BPoint *bp;
+       float *fp;
+       int a, tot;
+
+       bp= lt->def;
+       fp= kb->data;
+
+       tot= lt->pntsu*lt->pntsv*lt->pntsw;
+       tot= MIN2(kb->totelem, tot);
+
+       for(a=0; a<tot; a++, fp+=3, bp++) {
+               VECCOPY(bp->vec, fp);
+       }
+}
+
+/************************* Curve ************************/
+void curve_to_key(Curve *cu, KeyBlock *kb, ListBase *nurb)
+{
+       Nurb *nu;
+       BezTriple *bezt;
+       BPoint *bp;
+       float *fp;
+       int a, tot;
+
+       /* count */
+       tot= count_curveverts(nurb);
+       if(tot==0) return;
+
+       if(kb->data) MEM_freeN(kb->data);
+
+       kb->data= MEM_callocN(cu->key->elemsize*tot, "kb->data");
+       kb->totelem= tot;
+
+       nu= nurb->first;
+       fp= kb->data;
+       while(nu) {
+
+               if(nu->bezt) {
+                       bezt= nu->bezt;
+                       a= nu->pntsu;
+                       while(a--) {
+                               VECCOPY(fp, bezt->vec[0]);
+                               fp+= 3;
+                               VECCOPY(fp, bezt->vec[1]);
+                               fp+= 3;
+                               VECCOPY(fp, bezt->vec[2]);
+                               fp+= 3;
+                               fp[0]= bezt->alfa;
+                               fp+= 3; /* alphas */
+                               bezt++;
+                       }
+               }
+               else {
+                       bp= nu->bp;
+                       a= nu->pntsu*nu->pntsv;
+                       while(a--) {
+                               VECCOPY(fp, bp->vec);
+                               fp[3]= bp->alfa;
+
+                               fp+= 4;
+                               bp++;
+                       }
+               }
+               nu= nu->next;
+       }
+}
+
+void key_to_curve(KeyBlock *kb, Curve *UNUSED(cu), ListBase *nurb)
+{
+       Nurb *nu;
+       BezTriple *bezt;
+       BPoint *bp;
+       float *fp;
+       int a, tot;
+
+       nu= nurb->first;
+       fp= kb->data;
+
+       tot= count_curveverts(nurb);
+
+       tot= MIN2(kb->totelem, tot);
+
+       while(nu && tot>0) {
+
+               if(nu->bezt) {
+                       bezt= nu->bezt;
+                       a= nu->pntsu;
+                       while(a-- && tot>0) {
+                               VECCOPY(bezt->vec[0], fp);
+                               fp+= 3;
+                               VECCOPY(bezt->vec[1], fp);
+                               fp+= 3;
+                               VECCOPY(bezt->vec[2], fp);
+                               fp+= 3;
+                               bezt->alfa= fp[0];
+                               fp+= 3; /* alphas */
+
+                               tot-= 3;
+                               bezt++;
+                       }
+               }
+               else {
+                       bp= nu->bp;
+                       a= nu->pntsu*nu->pntsv;
+                       while(a-- && tot>0) {
+                               VECCOPY(bp->vec, fp);
+                               bp->alfa= fp[3];
+
+                               fp+= 4;
+                               tot--;
+                               bp++;
+                       }
+               }
+               nu= nu->next;
+       }
+}
+
+/************************* Mesh ************************/
+void mesh_to_key(Mesh *me, KeyBlock *kb)
+{
+       MVert *mvert;
+       float *fp;
+       int a;
+
+       if(me->totvert==0) return;
+
+       if(kb->data) MEM_freeN(kb->data);
+
+       kb->data= MEM_callocN(me->key->elemsize*me->totvert, "kb->data");
+       kb->totelem= me->totvert;
+
+       mvert= me->mvert;
+       fp= kb->data;
+       for(a=0; a<kb->totelem; a++, fp+=3, mvert++) {
+               VECCOPY(fp, mvert->co);
+
+       }
+}
+
+void key_to_mesh(KeyBlock *kb, Mesh *me)
+{
+       MVert *mvert;
+       float *fp;
+       int a, tot;
+
+       mvert= me->mvert;
+       fp= kb->data;
+
+       tot= MIN2(kb->totelem, me->totvert);
+
+       for(a=0; a<tot; a++, fp+=3, mvert++) {
+               VECCOPY(mvert->co, fp);
+       }
+}
+
+/************************* vert coords ************************/
+float (*key_to_vertcos(Object *ob, KeyBlock *kb))[3]
+{
+       float (*vertCos)[3], *co;
+       float *fp= kb->data;
+       int tot= 0, a;
+
+       /* Count of vertex coords in array */
+       if(ob->type == OB_MESH) {
+               Mesh *me= (Mesh*)ob->data;
+               tot= me->totvert;
+       } else if(ob->type == OB_LATTICE) {
+               Lattice *lt= (Lattice*)ob->data;
+               tot= lt->pntsu*lt->pntsv*lt->pntsw;
+       } else if(ELEM(ob->type, OB_CURVE, OB_SURF)) {
+               Curve *cu= (Curve*)ob->data;
+               tot= count_curveverts(&cu->nurb);
+       }
+
+       if (tot == 0) return NULL;
+
+       vertCos= MEM_callocN(tot*sizeof(*vertCos), "key_to_vertcos vertCos");
+
+       /* Copy coords to array */
+       co= (float*)vertCos;
+
+       if(ELEM(ob->type, OB_MESH, OB_LATTICE)) {
+               for (a= 0; a<tot; a++, fp+=3, co+=3) {
+                       copy_v3_v3(co, fp);
+               }
+       } else if(ELEM(ob->type, OB_CURVE, OB_SURF)) {
+               Curve *cu= (Curve*)ob->data;
+               Nurb *nu= cu->nurb.first;
+               BezTriple *bezt;
+               BPoint *bp;
+
+               while (nu) {
+                       if(nu->bezt) {
+                               int i;
+                               bezt= nu->bezt;
+                               a= nu->pntsu;
+
+                               while (a--) {
+                                       for (i= 0; i<3; i++) {
+                                               copy_v3_v3(co, fp);
+                                               fp+= 3; co+= 3;
+                                       }
+
+                                       fp+= 3; /* skip alphas */
+
+                                       bezt++;
+                               }
+                       }
+                       else {
+                               bp= nu->bp;
+                               a= nu->pntsu*nu->pntsv;
+
+                               while (a--) {
+                                       copy_v3_v3(co, fp);
+
+                                       fp+= 4;
+                                       co+= 3;
+
+                                       bp++;
+                               }
+                       }
+
+                       nu= nu->next;
+               }
+       }
+
+       return vertCos;
+}
+
+void vertcos_to_key(Object *ob, KeyBlock *kb, float (*vertCos)[3])
+{
+       float *co= (float*)vertCos, *fp;
+       int tot= 0, a, elemsize;
+
+       if (kb->data) MEM_freeN(kb->data);
+
+       /* Count of vertex coords in array */
+       if(ob->type == OB_MESH) {
+               Mesh *me= (Mesh*)ob->data;
+               tot= me->totvert;
+               elemsize= me->key->elemsize;
+       } else if(ob->type == OB_LATTICE) {
+               Lattice *lt= (Lattice*)ob->data;
+               tot= lt->pntsu*lt->pntsv*lt->pntsw;
+               elemsize= lt->key->elemsize;
+       } else if(ELEM(ob->type, OB_CURVE, OB_SURF)) {
+               Curve *cu= (Curve*)ob->data;
+               elemsize= cu->key->elemsize;
+               tot= count_curveverts(&cu->nurb);
+       }
+
+       if (tot == 0) {
+               kb->data= NULL;
+               return;
+       }
+
+       fp= kb->data= MEM_callocN(tot*elemsize, "key_to_vertcos vertCos");
+
+       /* Copy coords to keyblock */
+
+       if(ELEM(ob->type, OB_MESH, OB_LATTICE)) {
+               for (a= 0; a<tot; a++, fp+=3, co+=3) {
+                       copy_v3_v3(fp, co);
+               }
+       } else if(ELEM(ob->type, OB_CURVE, OB_SURF)) {
+               Curve *cu= (Curve*)ob->data;
+               Nurb *nu= cu->nurb.first;
+               BezTriple *bezt;
+               BPoint *bp;
+
+               while (nu) {
+                       if(nu->bezt) {
+                               int i;
+                               bezt= nu->bezt;
+                               a= nu->pntsu;
+
+                               while (a--) {
+                                       for (i= 0; i<3; i++) {
+                                               copy_v3_v3(fp, co);
+                                               fp+= 3; co+= 3;
+                                       }
+
+                                       fp+= 3; /* skip alphas */
+
+                                       bezt++;
+                               }
+                       }
+                       else {
+                               bp= nu->bp;
+                               a= nu->pntsu*nu->pntsv;
+
+                               while (a--) {
+                                       copy_v3_v3(fp, co);
+
+                                       fp+= 4;
+                                       co+= 3;
+
+                                       bp++;
+                               }
+                       }
+
+                       nu= nu->next;
+               }
+       }
+}
+
+void offset_to_key(Object *ob, KeyBlock *kb, float (*ofs)[3])
+{
+       int a;
+       float *co= (float*)ofs, *fp= kb->data;
+
+       if(ELEM(ob->type, OB_MESH, OB_LATTICE)) {
+               for (a= 0; a<kb->totelem; a++, fp+=3, co+=3) {
+                       add_v3_v3(fp, co);
+               }
+       } else if(ELEM(ob->type, OB_CURVE, OB_SURF)) {
+               Curve *cu= (Curve*)ob->data;
+               Nurb *nu= cu->nurb.first;
+               BezTriple *bezt;
+               BPoint *bp;
+
+               while (nu) {
+                       if(nu->bezt) {
+                               int i;
+                               bezt= nu->bezt;
+                               a= nu->pntsu;
+
+                               while (a--) {
+                                       for (i= 0; i<3; i++) {
+                                               add_v3_v3(fp, co);
+                                               fp+= 3; co+= 3;
+                                       }
+
+                                       fp+= 3; /* skip alphas */
+
+                                       bezt++;
+                               }
+                       }
+                       else {
+                               bp= nu->bp;
+                               a= nu->pntsu*nu->pntsv;
+
+                               while (a--) {
+                                       add_v3_v3(fp, co);
+
+                                       fp+= 4;
+                                       co+= 3;
+
+                                       bp++;
+                               }
+                       }
+
+                       nu= nu->next;
                }
        }
-       
-       return NULL;
 }