doxygen: blender/blenkernel tagged.
[blender.git] / source / blender / blenkernel / intern / lattice.c
index 6e5f7c82aed0b68fa2cafa760877533a402573cd..091c4a2fe5024ccd7325781619dcb6de8b45e7e1 100644 (file)
@@ -1,4 +1,4 @@
-/**
+/*
  * lattice.c
  *
  *
@@ -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/lattice.c
+ *  \ingroup bke
+ */
+
+
 
 #include <stdio.h>
 #include <string.h>
 #include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
-#include "BLI_arithb.h"
+#include "BLI_math.h"
+#include "BLI_utildefines.h"
 
-#include "DNA_armature_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
-#include "DNA_modifier_types.h"
-#include "DNA_object_types.h"
 #include "DNA_scene_types.h"
+#include "DNA_object_types.h"
 #include "DNA_lattice_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_key_types.h"
 
+#include "BKE_animsys.h"
 #include "BKE_anim.h"
-#include "BKE_armature.h"
-#include "BKE_curve.h"
 #include "BKE_cdderivedmesh.h"
-#include "BKE_DerivedMesh.h"
-#include "BKE_deform.h"
 #include "BKE_displist.h"
 #include "BKE_global.h"
 #include "BKE_key.h"
@@ -65,9 +66,8 @@
 #include "BKE_main.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
-#include "BKE_object.h"
-#include "BKE_screen.h"
-#include "BKE_utildefines.h"
+
+#include "BKE_deform.h"
 
 //XXX #include "BIF_editdeform.h"
 
@@ -155,10 +155,10 @@ void resizelattice(Lattice *lt, int uNew, int vNew, int wNew, Object *ltOb)
                        /* prevent using deformed locations */
                freedisplist(&ltOb->disp);
 
-               Mat4CpyMat4(mat, ltOb->obmat);
-               Mat4One(ltOb->obmat);
+               copy_m4_m4(mat, ltOb->obmat);
+               unit_m4(ltOb->obmat);
                lattice_deform_verts(ltOb, NULL, NULL, vertexCos, uNew*vNew*wNew, NULL);
-               Mat4CpyMat4(ltOb->obmat, mat);
+               copy_m4_m4(ltOb->obmat, mat);
 
                lt->typeu = typeu;
                lt->typev = typev;
@@ -182,13 +182,13 @@ void resizelattice(Lattice *lt, int uNew, int vNew, int wNew, Object *ltOb)
        bp= lt->def;
        
        for (i=0; i<lt->pntsu*lt->pntsv*lt->pntsw; i++,bp++) {
-               VECCOPY(bp->vec, vertexCos[i]);
+               copy_v3_v3(bp->vec, vertexCos[i]);
        }
 
        MEM_freeN(vertexCos);
 }
 
-Lattice *add_lattice(char *name)
+Lattice *add_lattice(const char *name)
 {
        Lattice *lt;
        
@@ -210,10 +210,6 @@ Lattice *copy_lattice(Lattice *lt)
 
        ltn= copy_libblock(lt);
        ltn->def= MEM_dupallocN(lt->def);
-               
-#if 0 // XXX old animation system
-       id_us_plus((ID *)ltn->ipo);
-#endif // XXX old animation system
 
        ltn->key= copy_key(ltn->key);
        if(ltn->key) ltn->key->from= (ID *)ltn;
@@ -232,10 +228,20 @@ void free_lattice(Lattice *lt)
        if(lt->def) MEM_freeN(lt->def);
        if(lt->dvert) free_dverts(lt->dvert, lt->pntsu*lt->pntsv*lt->pntsw);
        if(lt->editlatt) {
-               if(lt->def) MEM_freeN(lt->def);
-               if(lt->dvert) free_dverts(lt->dvert, lt->pntsu*lt->pntsv*lt->pntsw);
+               Lattice *editlt= lt->editlatt->latt;
+
+               if(editlt->def) MEM_freeN(editlt->def);
+               if(editlt->dvert) free_dverts(editlt->dvert, lt->pntsu*lt->pntsv*lt->pntsw);
+
+               MEM_freeN(editlt);
                MEM_freeN(lt->editlatt);
        }
+       
+       /* free animation data */
+       if (lt->adt) {
+               BKE_free_animdata(&lt->id);
+               lt->adt= NULL;
+       }
 }
 
 
@@ -250,11 +256,11 @@ void make_local_lattice(Lattice *lt)
         * - mixed: make copy
         */
        
-       if(lt->id.lib==0) return;
+       if(lt->id.lib==NULL) return;
        if(lt->id.us==1) {
-               lt->id.lib= 0;
+               lt->id.lib= NULL;
                lt->id.flag= LIB_LOCAL;
-               new_id(0, (ID *)lt, 0);
+               new_id(NULL, (ID *)lt, NULL);
                return;
        }
        
@@ -268,9 +274,9 @@ void make_local_lattice(Lattice *lt)
        }
        
        if(local && lib==0) {
-               lt->id.lib= 0;
+               lt->id.lib= NULL;
                lt->id.flag= LIB_LOCAL;
-               new_id(0, (ID *)lt, 0);
+               new_id(NULL, (ID *)lt, NULL);
        }
        else if(local && lib) {
                ltn= copy_lattice(lt);
@@ -280,7 +286,7 @@ void make_local_lattice(Lattice *lt)
                while(ob) {
                        if(ob->data==lt) {
                                
-                               if(ob->id.lib==0) {
+                               if(ob->id.lib==NULL) {
                                        ob->data= ltn;
                                        ltn->id.us++;
                                        lt->id.us--;
@@ -302,7 +308,7 @@ void init_latt_deform(Object *oblatt, Object *ob)
        float fu, fv, fw;
        int u, v, w;
 
-       if(lt->editlatt) lt= lt->editlatt;
+       if(lt->editlatt) lt= lt->editlatt->latt;
        bp = lt->def;
        
        fp= lt->latticedata= MEM_mallocN(sizeof(float)*3*lt->pntsu*lt->pntsv*lt->pntsw, "latticedata");
@@ -310,18 +316,18 @@ void init_latt_deform(Object *oblatt, Object *ob)
                /* for example with a particle system: ob==0 */
        if(ob==NULL) {
                /* in deformspace, calc matrix  */
-               Mat4Invert(lt->latmat, oblatt->obmat);
+               invert_m4_m4(lt->latmat, oblatt->obmat);
        
                /* back: put in deform array */
-               Mat4Invert(imat, lt->latmat);
+               invert_m4_m4(imat, lt->latmat);
        }
        else {
                /* in deformspace, calc matrix */
-               Mat4Invert(imat, oblatt->obmat);
-               Mat4MulMat4(lt->latmat, ob->obmat, imat);
+               invert_m4_m4(imat, oblatt->obmat);
+               mul_m4_m4m4(lt->latmat, ob->obmat, imat);
        
                /* back: put in deform array */
-               Mat4Invert(imat, lt->latmat);
+               invert_m4_m4(imat, lt->latmat);
        }
        
        for(w=0,fw=lt->fw; w<lt->pntsw; w++,fw+=lt->dw) {
@@ -337,7 +343,7 @@ void init_latt_deform(Object *oblatt, Object *ob)
                                        fp[2] = bp->vec[2] - fw;
                                }
 
-                               Mat4Mul3Vecfl(imat, fp);
+                               mul_mat3_m4_v3(imat, fp);
                        }
                }
        }
@@ -347,98 +353,113 @@ void calc_latt_deform(Object *ob, float *co, float weight)
 {
        Lattice *lt= ob->data;
        float u, v, w, tu[4], tv[4], tw[4];
-       float *fpw, *fpv, *fpu, vec[3];
+       float vec[3];
+       int idx_w, idx_v, idx_u;
        int ui, vi, wi, uu, vv, ww;
-       
-       if(lt->editlatt) lt= lt->editlatt;
+
+       /* vgroup influence */
+       int defgroup_nr= -1;
+       float co_prev[3], weight_blend= 0.0f;
+       MDeformVert *dvert= lattice_get_deform_verts(ob);
+
+
+       if(lt->editlatt) lt= lt->editlatt->latt;
        if(lt->latticedata==NULL) return;
-       
+
+       if(lt->vgroup[0] && dvert) {
+               defgroup_nr= defgroup_name_index(ob, lt->vgroup);
+               copy_v3_v3(co_prev, co);
+       }
+
        /* co is in local coords, treat with latmat */
-       
-       VECCOPY(vec, co);
-       Mat4MulVecfl(lt->latmat, vec);
-       
+       mul_v3_m4v3(vec, lt->latmat, co);
+
        /* u v w coords */
-       
+
        if(lt->pntsu>1) {
                u= (vec[0]-lt->fu)/lt->du;
                ui= (int)floor(u);
                u -= ui;
-               set_four_ipo(u, tu, lt->typeu);
+               key_curve_position_weights(u, tu, lt->typeu);
        }
        else {
                tu[0]= tu[2]= tu[3]= 0.0; tu[1]= 1.0;
                ui= 0;
        }
-       
+
        if(lt->pntsv>1) {
                v= (vec[1]-lt->fv)/lt->dv;
                vi= (int)floor(v);
                v -= vi;
-               set_four_ipo(v, tv, lt->typev);
+               key_curve_position_weights(v, tv, lt->typev);
        }
        else {
                tv[0]= tv[2]= tv[3]= 0.0; tv[1]= 1.0;
                vi= 0;
        }
-       
+
        if(lt->pntsw>1) {
                w= (vec[2]-lt->fw)/lt->dw;
                wi= (int)floor(w);
                w -= wi;
-               set_four_ipo(w, tw, lt->typew);
+               key_curve_position_weights(w, tw, lt->typew);
        }
        else {
                tw[0]= tw[2]= tw[3]= 0.0; tw[1]= 1.0;
                wi= 0;
        }
-       
+
        for(ww= wi-1; ww<=wi+2; ww++) {
                w= tw[ww-wi+1];
-               
+
                if(w!=0.0) {
                        if(ww>0) {
-                               if(ww<lt->pntsw) fpw= lt->latticedata + 3*ww*lt->pntsu*lt->pntsv;
-                               else fpw= lt->latticedata + 3*(lt->pntsw-1)*lt->pntsu*lt->pntsv;
+                               if(ww<lt->pntsw) idx_w= ww*lt->pntsu*lt->pntsv;
+                               else idx_w= (lt->pntsw-1)*lt->pntsu*lt->pntsv;
                        }
-                       else fpw= lt->latticedata;
-                       
+                       else idx_w= 0;
+
                        for(vv= vi-1; vv<=vi+2; vv++) {
                                v= w*tv[vv-vi+1];
-                               
+
                                if(v!=0.0) {
                                        if(vv>0) {
-                                               if(vv<lt->pntsv) fpv= fpw + 3*vv*lt->pntsu;
-                                               else fpv= fpw + 3*(lt->pntsv-1)*lt->pntsu;
+                                               if(vv<lt->pntsv) idx_v= idx_w + vv*lt->pntsu;
+                                               else idx_v= idx_w + (lt->pntsv-1)*lt->pntsu;
                                        }
-                                       else fpv= fpw;
-                                       
+                                       else idx_v= idx_w;
+
                                        for(uu= ui-1; uu<=ui+2; uu++) {
                                                u= weight*v*tu[uu-ui+1];
-                                               
+
                                                if(u!=0.0) {
                                                        if(uu>0) {
-                                                               if(uu<lt->pntsu) fpu= fpv + 3*uu;
-                                                               else fpu= fpv + 3*(lt->pntsu-1);
+                                                               if(uu<lt->pntsu) idx_u= idx_v + uu;
+                                                               else idx_u= idx_v + (lt->pntsu-1);
                                                        }
-                                                       else fpu= fpv;
-                                                       
-                                                       co[0]+= u*fpu[0];
-                                                       co[1]+= u*fpu[1];
-                                                       co[2]+= u*fpu[2];
+                                                       else idx_u= idx_v;
+
+                                                       madd_v3_v3fl(co, &lt->latticedata[idx_u * 3], u);
+
+                                                       if(defgroup_nr != -1)
+                                                               weight_blend += (u * defvert_find_weight(dvert + idx_u, defgroup_nr));
                                                }
                                        }
                                }
                        }
                }
        }
+
+       if(defgroup_nr != -1)
+               interp_v3_v3v3(co, co_prev, co, weight_blend);
+
 }
 
 void end_latt_deform(Object *ob)
 {
        Lattice *lt= ob->data;
        
-       if(lt->editlatt) lt= lt->editlatt;
+       if(lt->editlatt) lt= lt->editlatt->latt;
        
        if(lt->latticedata)
                MEM_freeN(lt->latticedata);
@@ -456,23 +477,25 @@ typedef struct {
 
 static void init_curve_deform(Object *par, Object *ob, CurveDeform *cd, int dloc)
 {
-       Mat4Invert(ob->imat, ob->obmat);
-       Mat4MulMat4(cd->objectspace, par->obmat, ob->imat);
-       Mat4Invert(cd->curvespace, cd->objectspace);
-       Mat3CpyMat4(cd->objectspace3, cd->objectspace);
+       invert_m4_m4(ob->imat, ob->obmat);
+       mul_m4_m4m4(cd->objectspace, par->obmat, ob->imat);
+       invert_m4_m4(cd->curvespace, cd->objectspace);
+       copy_m3_m4(cd->objectspace3, cd->objectspace);
        
        // offset vector for 'no smear'
        if(dloc) {
-               Mat4Invert(par->imat, par->obmat);
-               VecMat4MulVecfl(cd->dloc, par->imat, ob->obmat[3]);
+               invert_m4_m4(par->imat, par->obmat);
+               mul_v3_m4v3(cd->dloc, par->imat, ob->obmat[3]);
+       }
+       else {
+               cd->dloc[0]=cd->dloc[1]=cd->dloc[2]= 0.0f;
        }
-       else cd->dloc[0]=cd->dloc[1]=cd->dloc[2]= 0.0f;
        
        cd->no_rot_axis= 0;
 }
 
 /* this makes sure we can extend for non-cyclic. *vec needs 4 items! */
-static int where_on_path_deform(Object *ob, float ctime, float *vec, float *dir)       /* returns OK */
+static int where_on_path_deform(Object *ob, float ctime, float *vec, float *dir, float *quat, float *radius)   /* returns OK */
 {
        Curve *cu= ob->data;
        BevList *bl;
@@ -490,21 +513,26 @@ static int where_on_path_deform(Object *ob, float ctime, float *vec, float *dir)
        else ctime1= ctime;
        
        /* vec needs 4 items */
-       if(where_on_path(ob, ctime1, vec, dir)) {
+       if(where_on_path(ob, ctime1, vec, dir, quat, radius, NULL)) {
                
                if(cycl==0) {
                        Path *path= cu->path;
                        float dvec[3];
                        
                        if(ctime < 0.0) {
-                               VecSubf(dvec, path->data+4, path->data);
-                               VecMulf(dvec, ctime*(float)path->len);
-                               VECADD(vec, vec, dvec);
+                               sub_v3_v3v3(dvec, path->data[1].vec, path->data[0].vec);
+                               mul_v3_fl(dvec, ctime*(float)path->len);
+                               add_v3_v3(vec, dvec);
+                               if(quat) copy_qt_qt(quat, path->data[0].quat);
+                               if(radius) *radius= path->data[0].radius;
                        }
                        else if(ctime > 1.0) {
-                               VecSubf(dvec, path->data+4*path->len-4, path->data+4*path->len-8);
-                               VecMulf(dvec, (ctime-1.0)*(float)path->len);
-                               VECADD(vec, vec, dvec);
+                               sub_v3_v3v3(dvec, path->data[path->len-1].vec, path->data[path->len-2].vec);
+                               mul_v3_fl(dvec, (ctime-1.0)*(float)path->len);
+                               add_v3_v3(vec, dvec);
+                               if(quat) copy_qt_qt(quat, path->data[path->len-1].quat);
+                               if(radius) *radius= path->data[path->len-1].radius;
+                               /* weight - not used but could be added */
                        }
                }
                return 1;
@@ -520,30 +548,13 @@ static int where_on_path_deform(Object *ob, float ctime, float *vec, float *dir)
 static int calc_curve_deform(Scene *scene, Object *par, float *co, short axis, CurveDeform *cd, float *quatp)
 {
        Curve *cu= par->data;
-       float fac, loc[4], dir[3], cent[3];
-       short upflag, index;
-       
-       if(axis==MOD_CURVE_POSX || axis==MOD_CURVE_NEGX) {
-               upflag= OB_POSZ;
-               cent[0]= 0.0;
-               cent[1]= co[1];
-               cent[2]= co[2];
-               index= 0;
-       }
-       else if(axis==MOD_CURVE_POSY || axis==MOD_CURVE_NEGY) {
-               upflag= OB_POSZ;
-               cent[0]= co[0];
-               cent[1]= 0.0;
-               cent[2]= co[2];
-               index= 1;
-       }
-       else {
-               upflag= OB_POSY;
-               cent[0]= co[0];
-               cent[1]= co[1];
-               cent[2]= 0.0;
-               index= 2;
-       }
+       float fac, loc[4], dir[3], new_quat[4], radius;
+       short /*upflag, */ index;
+
+       index= axis-1;
+       if(index>2)
+               index -= 3; /* negative  */
+
        /* to be sure, mostly after file load */
        if(cu->path==NULL) {
                makeDispListCurveTypes(scene, par, 0);
@@ -551,7 +562,7 @@ static int calc_curve_deform(Scene *scene, Object *par, float *co, short axis, C
        }
        
        /* options */
-       if(ELEM3(axis, OB_NEGX, OB_NEGY, OB_NEGZ)) {
+       if(ELEM3(axis, OB_NEGX+1, OB_NEGY+1, OB_NEGZ+1)) { /* OB_NEG# 0-5, MOD_CURVE_POS# 1-6 */
                if(cu->flag & CU_STRETCH)
                        fac= (-co[index]-cd->dmax[index])/(cd->dmax[index] - cd->dmin[index]);
                else
@@ -575,36 +586,81 @@ static int calc_curve_deform(Scene *scene, Object *par, float *co, short axis, C
        }
 #endif // XXX old animation system
        
-       if( where_on_path_deform(par, fac, loc, dir)) { /* returns OK */
-               float q[4], mat[3][3], quat[4];
-               
+       if( where_on_path_deform(par, fac, loc, dir, new_quat, &radius)) {      /* returns OK */
+               float quat[4], cent[3];
+
+#if 0  // XXX - 2.4x Z-Up, Now use bevel tilt.
                if(cd->no_rot_axis)     /* set by caller */
                        dir[cd->no_rot_axis-1]= 0.0f;
                
                /* -1 for compatibility with old track defines */
-               vectoquat(dir, axis-1, upflag, quat);
+               vec_to_quat( quat,dir, axis-1, upflag);
                
                /* the tilt */
                if(loc[3]!=0.0) {
-                       Normalize(dir);
+                       normalize_v3(dir);
                        q[0]= (float)cos(0.5*loc[3]);
                        fac= (float)sin(0.5*loc[3]);
                        q[1]= -fac*dir[0];
                        q[2]= -fac*dir[1];
                        q[3]= -fac*dir[2];
-                       QuatMul(quat, q, quat);
-               }               
-               QuatToMat3(quat, mat);
-       
-               /* local rotation */
-               Mat3MulVecfl(mat, cent);
+                       mul_qt_qtqt(quat, q, quat);
+               }
+#endif
+
+               if(cd->no_rot_axis) {   /* set by caller */
+
+                       /* this is not exactly the same as 2.4x, since the axis is having rotation removed rather then
+                        * changing the axis before calculating the tilt but serves much the same purpose */
+                       float dir_flat[3]={0,0,0}, q[4];
+                       copy_v3_v3(dir_flat, dir);
+                       dir_flat[cd->no_rot_axis-1]= 0.0f;
+
+                       normalize_v3(dir);
+                       normalize_v3(dir_flat);
+
+                       rotation_between_vecs_to_quat(q, dir, dir_flat); /* Could this be done faster? */
+
+                       mul_qt_qtqt(new_quat, q, new_quat);
+               }
+
+
+               /* Logic for 'cent' orientation *
+                *
+                * The way 'co' is copied to 'cent' may seem to have no meaning, but it does.
+                *
+                * Use a curve modifier to stretch a cube out, color each side RGB, positive side light, negative dark.
+                * view with X up (default), from the angle that you can see 3 faces RGB colors (light), anti-clockwise
+                * Notice X,Y,Z Up all have light colors and each ordered CCW.
+                *
+                * Now for Neg Up XYZ, the colors are all dark, and ordered clockwise - Campbell
+                *
+                * note: moved functions into quat_apply_track/vec_apply_track
+                * */
+               copy_qt_qt(quat, new_quat);
+               copy_v3_v3(cent, co);
+
+               /* zero the axis which is not used,
+                * the big block of text above now applies to these 3 lines */
+               quat_apply_track(quat, axis-1, (axis==1 || axis==3) ? 1:0); /* up flag is a dummy, set so no rotation is done */
+               vec_apply_track(cent, axis-1);
+               cent[axis < 4 ? axis-1 : axis-4]= 0.0f;
+
+
+               /* scale if enabled */
+               if(cu->flag & CU_PATH_RADIUS)
+                       mul_v3_fl(cent, radius);
                
+               /* local rotation */
+               normalize_qt(quat);
+               mul_qt_v3(quat, cent);
+
                /* translation */
-               VECADD(co, cent, loc);
-               
+               add_v3_v3v3(co, cent, loc);
+
                if(quatp)
-                       QUATCOPY(quatp, quat);
-               
+                       copy_qt_qt(quatp, quat);
+
                return 1;
        }
        return 0;
@@ -625,7 +681,18 @@ void curve_deform_verts(Scene *scene, Object *cuOb, Object *target, DerivedMesh
        cu->flag |= (CU_PATH|CU_FOLLOW); // needed for path & bevlist
 
        init_curve_deform(cuOb, target, &cd, (cu->flag & CU_STRETCH)==0);
-               
+
+       /* dummy bounds, keep if CU_DEFORM_BOUNDS_OFF is set */
+       if(defaxis < 3) {
+               cd.dmin[0]= cd.dmin[1]= cd.dmin[2]= 0.0f;
+               cd.dmax[0]= cd.dmax[1]= cd.dmax[2]= 1.0f;
+       }
+       else {
+               /* negative, these bounds give a good rest position */
+               cd.dmin[0]= cd.dmin[1]= cd.dmin[2]= -1.0f;
+               cd.dmax[0]= cd.dmax[1]= cd.dmax[2]=  0.0f;
+       }
+       
        /* check whether to use vertex groups (only possible if target is a Mesh)
         * we want either a Mesh with no derived data, or derived data with
         * deformverts
@@ -640,62 +707,84 @@ void curve_deform_verts(Scene *scene, Object *cuOb, Object *target, DerivedMesh
                use_vgroups = 0;
        
        if(vgroup && vgroup[0] && use_vgroups) {
-               bDeformGroup *curdef;
                Mesh *me= target->data;
-               int index;
-               
-               /* find the group (weak loop-in-loop) */
-               for(index = 0, curdef = target->defbase.first; curdef;
-                   curdef = curdef->next, index++)
-                       if (!strcmp(curdef->name, vgroup))
-                               break;
+               int index= defgroup_name_index(target, vgroup);
 
-               if(curdef && (me->dvert || dm)) {
+               if(index != -1 && (me->dvert || dm)) {
                        MDeformVert *dvert = me->dvert;
                        float vec[3];
-                       int j;
-
-                       INIT_MINMAX(cd.dmin, cd.dmax);
-
-                       for(a = 0; a < numVerts; a++, dvert++) {
-                               if(dm) dvert = dm->getVertData(dm, a, CD_MDEFORMVERT);
+                       float weight;
+       
 
-                               for(j = 0; j < dvert->totweight; j++) {
-                                       if(dvert->dw[j].def_nr == index) {
-                                               Mat4MulVecfl(cd.curvespace, vertexCos[a]);
-                                               DO_MINMAX(vertexCos[a], cd.dmin, cd.dmax);
-                                               break;
+                       if(cu->flag & CU_DEFORM_BOUNDS_OFF) {
+                               /* dummy bounds */
+                               cd.dmin[0]= cd.dmin[1]= cd.dmin[2]= 0.0f;
+                               cd.dmax[0]= cd.dmax[1]= cd.dmax[2]= 1.0f;
+                               
+                               dvert = me->dvert;
+                               for(a = 0; a < numVerts; a++, dvert++) {
+                                       if(dm) dvert = dm->getVertData(dm, a, CD_MDEFORMVERT);
+                                       weight= defvert_find_weight(dvert, index);
+       
+                                       if(weight > 0.0f) {
+                                               mul_m4_v3(cd.curvespace, vertexCos[a]);
+                                               copy_v3_v3(vec, vertexCos[a]);
+                                               calc_curve_deform(scene, cuOb, vec, defaxis, &cd, NULL);
+                                               interp_v3_v3v3(vertexCos[a], vertexCos[a], vec, weight);
+                                               mul_m4_v3(cd.objectspace, vertexCos[a]);
                                        }
                                }
                        }
-
-                       dvert = me->dvert;
-                       for(a = 0; a < numVerts; a++, dvert++) {
-                               if(dm) dvert = dm->getVertData(dm, a, CD_MDEFORMVERT);
-
-                               for(j = 0; j < dvert->totweight; j++) {
-                                       if(dvert->dw[j].def_nr == index) {
-                                               VECCOPY(vec, vertexCos[a]);
+                       else {
+                               /* set mesh min/max bounds */
+                               INIT_MINMAX(cd.dmin, cd.dmax);
+       
+                               for(a = 0; a < numVerts; a++, dvert++) {
+                                       if(dm) dvert = dm->getVertData(dm, a, CD_MDEFORMVERT);
+                                       
+                                       if(defvert_find_weight(dvert, index) > 0.0f) {
+                                               mul_m4_v3(cd.curvespace, vertexCos[a]);
+                                               DO_MINMAX(vertexCos[a], cd.dmin, cd.dmax);
+                                       }
+                               }
+       
+                               dvert = me->dvert;
+                               for(a = 0; a < numVerts; a++, dvert++) {
+                                       if(dm) dvert = dm->getVertData(dm, a, CD_MDEFORMVERT);
+                                       
+                                       weight= defvert_find_weight(dvert, index);
+       
+                                       if(weight > 0.0f) {
+                                               copy_v3_v3(vec, vertexCos[a]);
                                                calc_curve_deform(scene, cuOb, vec, defaxis, &cd, NULL);
-                                               VecLerpf(vertexCos[a], vertexCos[a], vec,
-                                                        dvert->dw[j].weight);
-                                               Mat4MulVecfl(cd.objectspace, vertexCos[a]);
-                                               break;
+                                               interp_v3_v3v3(vertexCos[a], vertexCos[a], vec, weight);
+                                               mul_m4_v3(cd.objectspace, vertexCos[a]);
                                        }
                                }
                        }
                }
-       } else {
-               INIT_MINMAX(cd.dmin, cd.dmax);
-                       
-               for(a = 0; a < numVerts; a++) {
-                       Mat4MulVecfl(cd.curvespace, vertexCos[a]);
-                       DO_MINMAX(vertexCos[a], cd.dmin, cd.dmax);
+       }
+       else {
+               if(cu->flag & CU_DEFORM_BOUNDS_OFF) {
+                       for(a = 0; a < numVerts; a++) {
+                               mul_m4_v3(cd.curvespace, vertexCos[a]);
+                               calc_curve_deform(scene, cuOb, vertexCos[a], defaxis, &cd, NULL);
+                               mul_m4_v3(cd.objectspace, vertexCos[a]);
+                       }
                }
-
-               for(a = 0; a < numVerts; a++) {
-                       calc_curve_deform(scene, cuOb, vertexCos[a], defaxis, &cd, NULL);
-                       Mat4MulVecfl(cd.objectspace, vertexCos[a]);
+               else {
+                       /* set mesh min max bounds */
+                       INIT_MINMAX(cd.dmin, cd.dmax);
+                               
+                       for(a = 0; a < numVerts; a++) {
+                               mul_m4_v3(cd.curvespace, vertexCos[a]);
+                               DO_MINMAX(vertexCos[a], cd.dmin, cd.dmax);
+                       }
+       
+                       for(a = 0; a < numVerts; a++) {
+                               calc_curve_deform(scene, cuOb, vertexCos[a], defaxis, &cd, NULL);
+                               mul_m4_v3(cd.objectspace, vertexCos[a]);
+                       }
                }
        }
        cu->flag = flag;
@@ -710,33 +799,33 @@ void curve_deform_vector(Scene *scene, Object *cuOb, Object *target, float *orco
        float quat[4];
        
        if(cuOb->type != OB_CURVE) {
-               Mat3One(mat);
+               unit_m3(mat);
                return;
        }
 
        init_curve_deform(cuOb, target, &cd, 0);        /* 0 no dloc */
        cd.no_rot_axis= no_rot_axis;                            /* option to only rotate for XY, for example */
        
-       VECCOPY(cd.dmin, orco);
-       VECCOPY(cd.dmax, orco);
+       copy_v3_v3(cd.dmin, orco);
+       copy_v3_v3(cd.dmax, orco);
 
-       Mat4MulVecfl(cd.curvespace, vec);
+       mul_m4_v3(cd.curvespace, vec);
        
        if(calc_curve_deform(scene, cuOb, vec, target->trackflag+1, &cd, quat)) {
                float qmat[3][3];
                
-               QuatToMat3(quat, qmat);
-               Mat3MulMat3(mat, qmat, cd.objectspace3);
+               quat_to_mat3( qmat,quat);
+               mul_m3_m3m3(mat, qmat, cd.objectspace3);
        }
        else
-               Mat3One(mat);
+               unit_m3(mat);
        
-       Mat4MulVecfl(cd.objectspace, vec);
+       mul_m4_v3(cd.objectspace, vec);
 
 }
 
 void lattice_deform_verts(Object *laOb, Object *target, DerivedMesh *dm,
-                          float (*vertexCos)[3], int numVerts, char *vgroup)
+                                                 float (*vertexCos)[3], int numVerts, char *vgroup)
 {
        int a;
        int use_vgroups;
@@ -760,26 +849,20 @@ void lattice_deform_verts(Object *laOb, Object *target, DerivedMesh *dm,
                use_vgroups = 0;
        
        if(vgroup && vgroup[0] && use_vgroups) {
-               bDeformGroup *curdef;
                Mesh *me = target->data;
-               int index = 0;
-               
-               /* find the group (weak loop-in-loop) */
-               for(curdef = target->defbase.first; curdef;
-                   curdef = curdef->next, index++)
-                       if(!strcmp(curdef->name, vgroup)) break;
+               int index = defgroup_name_index(target, vgroup);
+               float weight;
 
-               if(curdef && (me->dvert || dm)) {
+               if(index >= 0 && (me->dvert || dm)) {
                        MDeformVert *dvert = me->dvert;
-                       int j;
                        
                        for(a = 0; a < numVerts; a++, dvert++) {
                                if(dm) dvert = dm->getVertData(dm, a, CD_MDEFORMVERT);
-                               for(j = 0; j < dvert->totweight; j++) {
-                                       if (dvert->dw[j].def_nr == index) {
-                                               calc_latt_deform(laOb, vertexCos[a], dvert->dw[j].weight);
-                                       }
-                               }
+
+                               weight= defvert_find_weight(dvert, index);
+
+                               if(weight > 0.0f)
+                                       calc_latt_deform(laOb, vertexCos[a], weight);
                        }
                }
        } else {
@@ -790,14 +873,14 @@ void lattice_deform_verts(Object *laOb, Object *target, DerivedMesh *dm,
        end_latt_deform(laOb);
 }
 
-int object_deform_mball(Object *ob)
+int object_deform_mball(Object *ob, ListBase *dispbase)
 {
        if(ob->parent && ob->parent->type==OB_LATTICE && ob->partype==PARSKEL) {
                DispList *dl;
 
-               for (dl=ob->disp.first; dl; dl=dl->next) {
+               for (dl=dispbase->first; dl; dl=dl->next) {
                        lattice_deform_verts(ob->parent, ob, NULL,
-                                            (float(*)[3]) dl->verts, dl->nr, NULL);
+                                                                (float(*)[3]) dl->verts, dl->nr, NULL);
                }
 
                return 1;
@@ -817,59 +900,68 @@ void outside_lattice(Lattice *lt)
        int u, v, w;
        float fac1, du=0.0, dv=0.0, dw=0.0;
 
-       bp= lt->def;
+       if(lt->flag & LT_OUTSIDE) {
+               bp= lt->def;
 
-       if(lt->pntsu>1) du= 1.0f/((float)lt->pntsu-1);
-       if(lt->pntsv>1) dv= 1.0f/((float)lt->pntsv-1);
-       if(lt->pntsw>1) dw= 1.0f/((float)lt->pntsw-1);
-               
-       for(w=0; w<lt->pntsw; w++) {
-               
-               for(v=0; v<lt->pntsv; v++) {
-               
-                       for(u=0; u<lt->pntsu; u++, bp++) {
-                               if(u==0 || v==0 || w==0 || u==lt->pntsu-1 || v==lt->pntsv-1 || w==lt->pntsw-1);
-                               else {
-                               
-                                       bp->hide= 1;
-                                       bp->f1 &= ~SELECT;
-                                       
-                                       /* u extrema */
-                                       bp1= latt_bp(lt, 0, v, w);
-                                       bp2= latt_bp(lt, lt->pntsu-1, v, w);
-                                       
-                                       fac1= du*u;
-                                       bp->vec[0]= (1.0f-fac1)*bp1->vec[0] + fac1*bp2->vec[0];
-                                       bp->vec[1]= (1.0f-fac1)*bp1->vec[1] + fac1*bp2->vec[1];
-                                       bp->vec[2]= (1.0f-fac1)*bp1->vec[2] + fac1*bp2->vec[2];
-                                       
-                                       /* v extrema */
-                                       bp1= latt_bp(lt, u, 0, w);
-                                       bp2= latt_bp(lt, u, lt->pntsv-1, w);
-                                       
-                                       fac1= dv*v;
-                                       bp->vec[0]+= (1.0f-fac1)*bp1->vec[0] + fac1*bp2->vec[0];
-                                       bp->vec[1]+= (1.0f-fac1)*bp1->vec[1] + fac1*bp2->vec[1];
-                                       bp->vec[2]+= (1.0f-fac1)*bp1->vec[2] + fac1*bp2->vec[2];
-                                       
-                                       /* w extrema */
-                                       bp1= latt_bp(lt, u, v, 0);
-                                       bp2= latt_bp(lt, u, v, lt->pntsw-1);
-                                       
-                                       fac1= dw*w;
-                                       bp->vec[0]+= (1.0f-fac1)*bp1->vec[0] + fac1*bp2->vec[0];
-                                       bp->vec[1]+= (1.0f-fac1)*bp1->vec[1] + fac1*bp2->vec[1];
-                                       bp->vec[2]+= (1.0f-fac1)*bp1->vec[2] + fac1*bp2->vec[2];
-                                       
-                                       VecMulf(bp->vec, 0.3333333f);
+               if(lt->pntsu>1) du= 1.0f/((float)lt->pntsu-1);
+               if(lt->pntsv>1) dv= 1.0f/((float)lt->pntsv-1);
+               if(lt->pntsw>1) dw= 1.0f/((float)lt->pntsw-1);
+                       
+               for(w=0; w<lt->pntsw; w++) {
+                       
+                       for(v=0; v<lt->pntsv; v++) {
+                       
+                               for(u=0; u<lt->pntsu; u++, bp++) {
+                                       if(u==0 || v==0 || w==0 || u==lt->pntsu-1 || v==lt->pntsv-1 || w==lt->pntsw-1);
+                                       else {
                                        
+                                               bp->hide= 1;
+                                               bp->f1 &= ~SELECT;
+                                               
+                                               /* u extrema */
+                                               bp1= latt_bp(lt, 0, v, w);
+                                               bp2= latt_bp(lt, lt->pntsu-1, v, w);
+                                               
+                                               fac1= du*u;
+                                               bp->vec[0]= (1.0f-fac1)*bp1->vec[0] + fac1*bp2->vec[0];
+                                               bp->vec[1]= (1.0f-fac1)*bp1->vec[1] + fac1*bp2->vec[1];
+                                               bp->vec[2]= (1.0f-fac1)*bp1->vec[2] + fac1*bp2->vec[2];
+                                               
+                                               /* v extrema */
+                                               bp1= latt_bp(lt, u, 0, w);
+                                               bp2= latt_bp(lt, u, lt->pntsv-1, w);
+                                               
+                                               fac1= dv*v;
+                                               bp->vec[0]+= (1.0f-fac1)*bp1->vec[0] + fac1*bp2->vec[0];
+                                               bp->vec[1]+= (1.0f-fac1)*bp1->vec[1] + fac1*bp2->vec[1];
+                                               bp->vec[2]+= (1.0f-fac1)*bp1->vec[2] + fac1*bp2->vec[2];
+                                               
+                                               /* w extrema */
+                                               bp1= latt_bp(lt, u, v, 0);
+                                               bp2= latt_bp(lt, u, v, lt->pntsw-1);
+                                               
+                                               fac1= dw*w;
+                                               bp->vec[0]+= (1.0f-fac1)*bp1->vec[0] + fac1*bp2->vec[0];
+                                               bp->vec[1]+= (1.0f-fac1)*bp1->vec[1] + fac1*bp2->vec[1];
+                                               bp->vec[2]+= (1.0f-fac1)*bp1->vec[2] + fac1*bp2->vec[2];
+                                               
+                                               mul_v3_fl(bp->vec, 0.3333333f);
+                                               
+                                       }
                                }
+                               
                        }
                        
                }
-               
        }
-       
+       else {
+               bp= lt->def;
+
+               for(w=0; w<lt->pntsw; w++)
+                       for(v=0; v<lt->pntsv; v++)
+                               for(u=0; u<lt->pntsu; u++, bp++)
+                                       bp->hide= 0;
+       }
 }
 
 float (*lattice_getVertexCos(struct Object *ob, int *numVerts_r))[3]
@@ -878,13 +970,13 @@ float (*lattice_getVertexCos(struct Object *ob, int *numVerts_r))[3]
        int i, numVerts;
        float (*vertexCos)[3];
 
-       if(lt->editlatt) lt= lt->editlatt;
+       if(lt->editlatt) lt= lt->editlatt->latt;
        numVerts = *numVerts_r = lt->pntsu*lt->pntsv*lt->pntsw;
        
        vertexCos = MEM_mallocN(sizeof(*vertexCos)*numVerts,"lt_vcos");
        
        for (i=0; i<numVerts; i++) {
-               VECCOPY(vertexCos[i], lt->def[i].vec);
+               copy_v3_v3(vertexCos[i], lt->def[i].vec);
        }
 
        return vertexCos;
@@ -896,7 +988,7 @@ void lattice_applyVertexCos(struct Object *ob, float (*vertexCos)[3])
        int i, numVerts = lt->pntsu*lt->pntsv*lt->pntsw;
 
        for (i=0; i<numVerts; i++) {
-               VECCOPY(lt->def[i].vec, vertexCos[i]);
+               copy_v3_v3(lt->def[i].vec, vertexCos[i]);
        }
 }
 
@@ -909,10 +1001,6 @@ void lattice_calc_modifiers(Scene *scene, Object *ob)
 
        freedisplist(&ob->disp);
 
-       if (!editmode) {
-               do_ob_key(scene, ob);
-       }
-
        for (; md; md=md->next) {
                ModifierTypeInfo *mti = modifierType_getInfo(md->type);
 
@@ -920,11 +1008,11 @@ void lattice_calc_modifiers(Scene *scene, Object *ob)
                
                if (!(md->mode&eModifierMode_Realtime)) continue;
                if (editmode && !(md->mode&eModifierMode_Editmode)) continue;
-               if (mti->isDisabled && mti->isDisabled(md)) continue;
+               if (mti->isDisabled && mti->isDisabled(md, 0)) continue;
                if (mti->type!=eModifierTypeType_OnlyDeform) continue;
 
                if (!vertexCos) vertexCos = lattice_getVertexCos(ob, &numVerts);
-               mti->deformVerts(md, ob, NULL, vertexCos, numVerts);
+               mti->deformVerts(md, ob, NULL, vertexCos, numVerts, 0, 0);
        }
 
        /* always displist to make this work like derivedmesh */
@@ -946,7 +1034,7 @@ struct MDeformVert* lattice_get_deform_verts(struct Object *oblatt)
        if(oblatt->type == OB_LATTICE)
        {
                Lattice *lt = (Lattice*)oblatt->data;
-               if(lt->editlatt) lt= lt->editlatt;
+               if(lt->editlatt) lt= lt->editlatt->latt;
                return lt->dvert;
        }