Merging r41564 through r41596 from trunk into soc-2011-tomato
[blender.git] / source / blender / editors / transform / transform_conversions.c
index 74a5ee6..0a6f49f 100644 (file)
@@ -2968,8 +2968,8 @@ static TransData *ActionFCurveToTransData(TransData *td, TransData2D **td2dv, FC
                                td2d->h1 = bezt->vec[0];
                                td2d->h2 = bezt->vec[2];
                                
-                               VECCOPY2D(td2d->ih1, td2d->h1);
-                               VECCOPY2D(td2d->ih2, td2d->h2);
+                               copy_v2_v2(td2d->ih1, td2d->h1);
+                               copy_v2_v2(td2d->ih2, td2d->h2);
                                
                                td++;
                                td2d++;
@@ -3225,14 +3225,14 @@ static void bezt_to_transdata (TransData *td, TransData2D *td2d, AnimData *adt,
 
        if (td->flag & TD_MOVEHANDLE1) {
                td2d->h1 = bezt->vec[0];
-               VECCOPY2D(td2d->ih1, td2d->h1);
+               copy_v2_v2(td2d->ih1, td2d->h1);
        } 
        else    
                td2d->h1 = NULL;
 
        if (td->flag & TD_MOVEHANDLE2) {
                td2d->h2 = bezt->vec[2];
-               VECCOPY2D(td2d->ih2, td2d->h2);
+               copy_v2_v2(td2d->ih2, td2d->h2);
        } 
        else 
                td2d->h2 = NULL;