diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-11-06 20:34:44 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-06 20:34:44 +0400 |
commit | 7c88bc5952c7e9f8a7f48d00d94b335bd0169c2e (patch) | |
tree | 88727a456d9bec9c932b93c0ef14885b5164fadf /source/blender/editors/transform | |
parent | 3d1e45c414f81a690ad33e1ee4feacbf313c45b0 (diff) |
replace macros for bli math functions in editors
Diffstat (limited to 'source/blender/editors/transform')
-rw-r--r-- | source/blender/editors/transform/transform.c | 6 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 8 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_orientations.c | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 5d3e05dcaab..b5f0a4a071e 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -4847,7 +4847,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; } } @@ -4878,7 +4878,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; } } @@ -4895,7 +4895,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; } } diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 6de854ff6c9..7eb8dc11a43 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -2960,8 +2960,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++; @@ -3217,14 +3217,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; diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c index a09778726d5..5d61d2a1ebb 100644 --- a/source/blender/editors/transform/transform_orientations.c +++ b/source/blender/editors/transform/transform_orientations.c @@ -606,9 +606,9 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3], { if(efa->f & SELECT) { - VECADD(normal, normal, efa->n); + add_v3_v3(normal, efa->n); sub_v3_v3v3(vec, efa->v2->co, efa->v1->co); - VECADD(plane, plane, vec); + add_v3_v3(plane, vec); } } @@ -662,7 +662,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3], if(eed->f & SELECT) { /* use average vert normals as plane and edge vector as normal */ copy_v3_v3(plane, eed->v1->no); - VECADD(plane, plane, eed->v2->no); + add_v3_v3(plane, eed->v2->no); sub_v3_v3v3(normal, eed->v2->co, eed->v1->co); break; } @@ -683,7 +683,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3], v2 = eve; copy_v3_v3(plane, v1->no); - VECADD(plane, plane, v2->no); + add_v3_v3(plane, v2->no); sub_v3_v3v3(normal, v2->co, v1->co); break; } |