From 85540d5aa7abb487e546b5483fffeef2e6075af5 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 6 Nov 2011 16:38:21 +0000 Subject: more macro --> BLI math lib, mainly replace VECCOPY in render and blenkernel. --- source/blender/blenloader/intern/readfile.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'source/blender/blenloader') diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index e17f8c720a5..3a03a11b849 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -4412,7 +4412,7 @@ static void direct_link_object(FileData *fd, Object *ob) * a hook we need to make sure it gets converted * and free'd, regardless of version. */ - VECCOPY(hmd->cent, hook->cent); + copy_v3_v3(hmd->cent, hook->cent); hmd->falloff = hook->falloff; hmd->force = hook->force; hmd->indexar = hook->indexar; @@ -9607,7 +9607,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) part->obfac = paf->obfac; part->randfac = paf->randfac * 25.0f; part->dampfac = paf->damp; - VECCOPY(part->acc, paf->force); + copy_v3_v3(part->acc, paf->force); /* flags */ if(paf->stype & PAF_VECT) { @@ -10658,7 +10658,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) tot= MIN2(me->totvert, key->refkey->totelem); for(a=0; amvert[a].co, data) + copy_v3_v3(me->mvert[a].co, data); } } @@ -10668,7 +10668,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) tot= MIN2(lt->pntsu*lt->pntsv*lt->pntsw, key->refkey->totelem); for(a=0; adef[a].vec, data) + copy_v3_v3(lt->def[a].vec, data); } } @@ -10681,9 +10681,9 @@ static void do_versions(FileData *fd, Library *lib, Main *main) BezTriple *bezt = nu->bezt; for(a=0; apntsu; a++, bezt++) { - VECCOPY(bezt->vec[0], data); data+=3; - VECCOPY(bezt->vec[1], data); data+=3; - VECCOPY(bezt->vec[2], data); data+=3; + copy_v3_v3(bezt->vec[0], data); data+=3; + copy_v3_v3(bezt->vec[1], data); data+=3; + copy_v3_v3(bezt->vec[2], data); data+=3; bezt->alfa= *data; data++; } } @@ -10691,7 +10691,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) BPoint *bp = nu->bp; for(a=0; apntsu*nu->pntsv; a++, bp++) { - VECCOPY(bp->vec, data); data+=3; + copy_v3_v3(bp->vec, data); data+=3; bp->alfa= *data; data++; } } @@ -13376,7 +13376,7 @@ static void give_base_to_groups(Main *mainvar, Scene *scene) ob->dup_group= group; ob->transflag |= OB_DUPLIGROUP; rename_id(&ob->id, group->id.name+2); - VECCOPY(ob->loc, scene->cursor); + copy_v3_v3(ob->loc, scene->cursor); } } } -- cgit v1.2.3