From 8c85f1316cdebc636f0210478a8a36b9475269fd Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 30 Nov 2018 15:08:47 +1100 Subject: Cleanup: name macros w/ matching BEGIN/END --- source/blender/blenloader/intern/readfile.c | 12 ++++++------ source/blender/blenloader/intern/versioning_270.c | 2 +- source/blender/blenloader/intern/writefile.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'source/blender/blenloader/intern') diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 2e07143c523..d689b871a64 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -2462,7 +2462,7 @@ static void lib_link_fcurves(FileData *fd, ID *id, ListBase *list) DriverVar *dvar; for (dvar = driver->variables.first; dvar; dvar = dvar->next) { - DRIVER_TARGETS_LOOPER(dvar) + DRIVER_TARGETS_LOOPER_BEGIN(dvar) { /* only relink if still used */ if (tarIndex < dvar->num_targets) @@ -2470,7 +2470,7 @@ static void lib_link_fcurves(FileData *fd, ID *id, ListBase *list) else dtar->id = NULL; } - DRIVER_TARGETS_LOOPER_END + DRIVER_TARGETS_LOOPER_END; } } @@ -2564,7 +2564,7 @@ static void direct_link_fcurves(FileData *fd, ListBase *list) /* relink variables, targets and their paths */ link_list(fd, &driver->variables); for (dvar = driver->variables.first; dvar; dvar = dvar->next) { - DRIVER_TARGETS_LOOPER(dvar) + DRIVER_TARGETS_LOOPER_BEGIN(dvar) { /* only relink the targets being used */ if (tarIndex < dvar->num_targets) @@ -2572,7 +2572,7 @@ static void direct_link_fcurves(FileData *fd, ListBase *list) else dtar->rna_path = NULL; } - DRIVER_TARGETS_LOOPER_END + DRIVER_TARGETS_LOOPER_END; } } @@ -9082,12 +9082,12 @@ static void expand_fcurves(FileData *fd, Main *mainvar, ListBase *list) DriverVar *dvar; for (dvar = driver->variables.first; dvar; dvar = dvar->next) { - DRIVER_TARGETS_LOOPER(dvar) + DRIVER_TARGETS_LOOPER_BEGIN(dvar) { // TODO: only expand those that are going to get used? expand_doit(fd, mainvar, dtar->id); } - DRIVER_TARGETS_LOOPER_END + DRIVER_TARGETS_LOOPER_END; } } diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c index 13b3040f8df..61aa1fc1a02 100644 --- a/source/blender/blenloader/intern/versioning_270.c +++ b/source/blender/blenloader/intern/versioning_270.c @@ -330,7 +330,7 @@ static void do_version_bbone_easing_fcurve_fix(ID *UNUSED(id), FCurve *fcu, void /* Driver -> Driver Vars (for bbone_in/out) */ if (fcu->driver) { for (DriverVar *dvar = fcu->driver->variables.first; dvar; dvar = dvar->next) { - DRIVER_TARGETS_LOOPER(dvar) + DRIVER_TARGETS_LOOPER_BEGIN(dvar) { if (dtar->rna_path) { dtar->rna_path = replace_bbone_easing_rnapath(dtar->rna_path); diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 6c9d9958dee..71a98efd25b 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -818,13 +818,13 @@ static void write_fcurves(WriteData *wd, ListBase *fcurves) /* variables */ writelist(wd, DATA, DriverVar, &driver->variables); for (dvar = driver->variables.first; dvar; dvar = dvar->next) { - DRIVER_TARGETS_USED_LOOPER(dvar) + DRIVER_TARGETS_USED_LOOPER_BEGIN(dvar) { if (dtar->rna_path) { writedata(wd, DATA, strlen(dtar->rna_path) + 1, dtar->rna_path); } } - DRIVER_TARGETS_LOOPER_END + DRIVER_TARGETS_LOOPER_END; } } -- cgit v1.2.3