Merging r41564 through r41596 from trunk into soc-2011-tomato
[blender.git] / source / blender / editors / transform / transform.c
index c0d319a77c95309acfb7008e3251ac8ae58c4f29..a8fcdbfcfd50dc50b8225f67f8e31eff1400bb26 100644 (file)
@@ -3920,7 +3920,7 @@ int Bevel(TransInfo *t, const int UNUSED(mval[2]))
                else {
                        d = distance;
                }
-               VECADDFAC(td->loc,td->center,td->axismtx[0],(*td->val)*d);
+               madd_v3_v3v3fl(td->loc, td->center, td->axismtx[0], (*td->val) * d);
        }
 
        recalcData(t);
@@ -4885,7 +4885,7 @@ int doEdgeSlide(TransInfo *t, float perc)
                                                interp_v2_v2v2(uv_tmp, suv->origuv,  (perc>=0)?suv->uv_up:suv->uv_down, fabs(perc));
                                                fuv_link = suv->fuv_list;
                                                while (fuv_link) {
-                                                       VECCOPY2D(((float *)fuv_link->link), uv_tmp);
+                                                       copy_v2_v2(((float *)fuv_link->link), uv_tmp);
                                                        fuv_link = fuv_link->next;
                                                }
                                        }
@@ -4916,7 +4916,7 @@ int doEdgeSlide(TransInfo *t, float perc)
                                                        interp_v2_v2v2(uv_tmp, suv->uv_down, suv->uv_up, fabs(newlen));
                                                        fuv_link = suv->fuv_list;
                                                        while (fuv_link) {
-                                                               VECCOPY2D(((float *)fuv_link->link), uv_tmp);
+                                                               copy_v2_v2(((float *)fuv_link->link), uv_tmp);
                                                                fuv_link = fuv_link->next;
                                                        }
                                                }
@@ -4933,7 +4933,7 @@ int doEdgeSlide(TransInfo *t, float perc)
                                                        interp_v2_v2v2(uv_tmp, suv->uv_up, suv->uv_down, fabs(newlen));
                                                        fuv_link = suv->fuv_list;
                                                        while (fuv_link) {
-                                                               VECCOPY2D(((float *)fuv_link->link), uv_tmp);
+                                                               copy_v2_v2(((float *)fuv_link->link), uv_tmp);
                                                                fuv_link = fuv_link->next;
                                                        }
                                                }