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/blenkernel/BKE_fcurve.h | 6 +++--- source/blender/blenkernel/intern/anim_sys.c | 8 ++++---- source/blender/blenkernel/intern/depsgraph.c | 4 ++-- source/blender/blenkernel/intern/fcurve.c | 20 ++++++++++---------- source/blender/blenkernel/intern/library_query.c | 4 ++-- source/blender/blenkernel/intern/object.c | 4 ++-- source/blender/blenloader/intern/readfile.c | 12 ++++++------ source/blender/blenloader/intern/versioning_270.c | 2 +- source/blender/blenloader/intern/writefile.c | 4 ++-- .../depsgraph/intern/builder/deg_builder_nodes.cc | 4 ++-- .../intern/builder/deg_builder_relations.cc | 4 ++-- source/blender/editors/animation/anim_filter.c | 4 ++-- source/blender/editors/armature/armature_relations.c | 4 ++-- .../blender/editors/space_outliner/outliner_tree.c | 4 ++-- source/gameengine/Converter/BL_ShapeDeformer.cpp | 4 ++-- 15 files changed, 44 insertions(+), 44 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/BKE_fcurve.h b/source/blender/blenkernel/BKE_fcurve.h index 055a3d40aba..f8ba646fd57 100644 --- a/source/blender/blenkernel/BKE_fcurve.h +++ b/source/blender/blenkernel/BKE_fcurve.h @@ -72,14 +72,14 @@ void bezt_add_to_cfra_elem(ListBase *lb, struct BezTriple *bezt); */ /* convenience looper over ALL driver targets for a given variable (even the unused ones) */ -#define DRIVER_TARGETS_LOOPER(dvar) \ +#define DRIVER_TARGETS_LOOPER_BEGIN(dvar) \ { \ DriverTarget *dtar = &dvar->targets[0]; \ int tarIndex = 0; \ for (; tarIndex < MAX_DRIVER_TARGETS; tarIndex++, dtar++) /* convenience looper over USED driver targets only */ -#define DRIVER_TARGETS_USED_LOOPER(dvar) \ +#define DRIVER_TARGETS_USED_LOOPER_BEGIN(dvar) \ { \ DriverTarget *dtar = &dvar->targets[0]; \ int tarIndex = 0; \ @@ -87,7 +87,7 @@ void bezt_add_to_cfra_elem(ListBase *lb, struct BezTriple *bezt); /* tidy up for driver targets loopers */ #define DRIVER_TARGETS_LOOPER_END \ -} +} ((void)0) /* ---------------------- */ diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index b17bc70c51a..500ece2a735 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -389,13 +389,13 @@ void BKE_animdata_merge_copy( DriverVar *dvar; for (dvar = driver->variables.first; dvar; dvar = dvar->next) { - DRIVER_TARGETS_USED_LOOPER(dvar) + DRIVER_TARGETS_USED_LOOPER_BEGIN(dvar) { if (dtar->id == src_id) { dtar->id = dst_id; } } - DRIVER_TARGETS_LOOPER_END + DRIVER_TARGETS_LOOPER_END; } } } @@ -766,7 +766,7 @@ static void drivers_path_rename_fix(ID *owner_id, ID *ref_id, const char *prefix /* driver variables */ for (dvar = driver->variables.first; dvar; dvar = dvar->next) { /* only change the used targets, since the others will need fixing manually anyway */ - DRIVER_TARGETS_USED_LOOPER(dvar) + DRIVER_TARGETS_USED_LOOPER_BEGIN(dvar) { /* rename RNA path */ if (dtar->rna_path && dtar->id) @@ -781,7 +781,7 @@ static void drivers_path_rename_fix(ID *owner_id, ID *ref_id, const char *prefix } } } - DRIVER_TARGETS_LOOPER_END + DRIVER_TARGETS_LOOPER_END; } } } diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c index 734aac8a1f7..15d08f5a230 100644 --- a/source/blender/blenkernel/intern/depsgraph.c +++ b/source/blender/blenkernel/intern/depsgraph.c @@ -343,7 +343,7 @@ static void dag_add_driver_relation(AnimData *adt, DagForest *dag, DagNode *node /* loop over variables to get the target relationships */ for (dvar = driver->variables.first; dvar; dvar = dvar->next) { /* only used targets */ - DRIVER_TARGETS_USED_LOOPER(dvar) + DRIVER_TARGETS_USED_LOOPER_BEGIN(dvar) { if (dtar->id) { /* FIXME: other data types need to be added here so that they can work! */ @@ -369,7 +369,7 @@ static void dag_add_driver_relation(AnimData *adt, DagForest *dag, DagNode *node } } } - DRIVER_TARGETS_LOOPER_END + DRIVER_TARGETS_LOOPER_END; } } } diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c index d4e69ad06ac..877f1c13da9 100644 --- a/source/blender/blenkernel/intern/fcurve.c +++ b/source/blender/blenkernel/intern/fcurve.c @@ -1317,7 +1317,7 @@ static short driver_check_valid_targets(ChannelDriver *driver, DriverVar *dvar) { short valid_targets = 0; - DRIVER_TARGETS_USED_LOOPER(dvar) + DRIVER_TARGETS_USED_LOOPER_BEGIN(dvar) { Object *ob = (Object *)dtar_id_ensure_proxy_from(dtar->id); @@ -1333,7 +1333,7 @@ static short driver_check_valid_targets(ChannelDriver *driver, DriverVar *dvar) valid_targets++; } } - DRIVER_TARGETS_LOOPER_END + DRIVER_TARGETS_LOOPER_END; return valid_targets; } @@ -1420,7 +1420,7 @@ static float dvar_eval_locDiff(ChannelDriver *driver, DriverVar *dvar) /* SECOND PASS: get two location values */ /* NOTE: for now, these are all just worldspace */ - DRIVER_TARGETS_USED_LOOPER(dvar) + DRIVER_TARGETS_USED_LOOPER_BEGIN(dvar) { /* get pointer to loc values to store in */ Object *ob = (Object *)dtar_id_ensure_proxy_from(dtar->id); @@ -1491,7 +1491,7 @@ static float dvar_eval_locDiff(ChannelDriver *driver, DriverVar *dvar) copy_v3_v3(loc1, tmp_loc); } } - DRIVER_TARGETS_LOOPER_END + DRIVER_TARGETS_LOOPER_END; /* if we're still here, there should now be two targets to use, @@ -1676,13 +1676,13 @@ void driver_free_variable(ListBase *variables, DriverVar *dvar) * currently, since there may be some lingering RNA paths from * previous users needing freeing */ - DRIVER_TARGETS_LOOPER(dvar) + DRIVER_TARGETS_LOOPER_BEGIN(dvar) { /* free RNA path if applicable */ if (dtar->rna_path) MEM_freeN(dtar->rna_path); } - DRIVER_TARGETS_LOOPER_END + DRIVER_TARGETS_LOOPER_END; /* remove the variable from the driver */ BLI_freelinkN(variables, dvar); @@ -1709,13 +1709,13 @@ void driver_variables_copy(ListBase *dst_vars, const ListBase *src_vars) for (DriverVar *dvar = dst_vars->first; dvar; dvar = dvar->next) { /* need to go over all targets so that we don't leave any dangling paths */ - DRIVER_TARGETS_LOOPER(dvar) + DRIVER_TARGETS_LOOPER_BEGIN(dvar) { /* make a copy of target's rna path if available */ if (dtar->rna_path) dtar->rna_path = MEM_dupallocN(dtar->rna_path); } - DRIVER_TARGETS_LOOPER_END + DRIVER_TARGETS_LOOPER_END; } } @@ -1735,7 +1735,7 @@ void driver_change_variable_type(DriverVar *dvar, int type) /* make changes to the targets based on the defines for these types * NOTE: only need to make sure the ones we're using here are valid... */ - DRIVER_TARGETS_USED_LOOPER(dvar) + DRIVER_TARGETS_USED_LOOPER_BEGIN(dvar) { short flags = dvti->target_flags[tarIndex]; @@ -1746,7 +1746,7 @@ void driver_change_variable_type(DriverVar *dvar, int type) if ((flags & DTAR_FLAG_ID_OB_ONLY) || (dtar->idtype == 0)) dtar->idtype = ID_OB; } - DRIVER_TARGETS_LOOPER_END + DRIVER_TARGETS_LOOPER_END; } /* Validate driver name (after being renamed) */ diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c index d59658a2a07..3292f0d6640 100644 --- a/source/blender/blenkernel/intern/library_query.c +++ b/source/blender/blenkernel/intern/library_query.c @@ -265,11 +265,11 @@ static void library_foreach_animationData(LibraryForeachIDData *data, AnimData * for (dvar = driver->variables.first; dvar; dvar = dvar->next) { /* only used targets */ - DRIVER_TARGETS_USED_LOOPER(dvar) + DRIVER_TARGETS_USED_LOOPER_BEGIN(dvar) { FOREACH_CALLBACK_INVOKE_ID(data, dtar->id, IDWALK_CB_NOP); } - DRIVER_TARGETS_LOOPER_END + DRIVER_TARGETS_LOOPER_END; } } diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index add7c1fd992..82c86747af8 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1303,7 +1303,7 @@ void BKE_object_copy_proxy_drivers(Object *ob, Object *target) for (dvar = driver->variables.first; dvar; dvar = dvar->next) { /* all drivers */ - DRIVER_TARGETS_LOOPER(dvar) + DRIVER_TARGETS_LOOPER_BEGIN(dvar) { if (dtar->id) { if ((Object *)dtar->id == target) @@ -1317,7 +1317,7 @@ void BKE_object_copy_proxy_drivers(Object *ob, Object *target) } } } - DRIVER_TARGETS_LOOPER_END + DRIVER_TARGETS_LOOPER_END; } } } 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; } } diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index 953c8db0b3b..92640718b03 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -562,12 +562,12 @@ void DepsgraphNodeBuilder::build_driver_variables(ID * id, FCurve *fcurve) { build_driver_id_property(id, fcurve->rna_path); LISTBASE_FOREACH (DriverVar *, dvar, &fcurve->driver->variables) { - DRIVER_TARGETS_USED_LOOPER(dvar) + DRIVER_TARGETS_USED_LOOPER_BEGIN(dvar) { build_id(dtar->id); build_driver_id_property(dtar->id, dtar->rna_path); } - DRIVER_TARGETS_LOOPER_END + DRIVER_TARGETS_LOOPER_END; } } diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index a3eac1120db..19bf2983033 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -1139,7 +1139,7 @@ void DepsgraphRelationBuilder::build_driver_variables(ID *id, FCurve *fcu) LISTBASE_FOREACH (DriverVar *, dvar, &driver->variables) { /* Only used targets. */ - DRIVER_TARGETS_USED_LOOPER(dvar) + DRIVER_TARGETS_USED_LOOPER_BEGIN(dvar) { if (dtar->id == NULL) { continue; @@ -1206,7 +1206,7 @@ void DepsgraphRelationBuilder::build_driver_variables(ID *id, FCurve *fcu) add_relation(target_key, driver_key, "RNA Target -> Driver"); } } - DRIVER_TARGETS_LOOPER_END + DRIVER_TARGETS_LOOPER_END; } } diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index fdfe08e03b6..e7430b5283c 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -1145,12 +1145,12 @@ static bool fcurve_has_errors(FCurve *fcu) /* check variables for other things that need linting... */ // TODO: maybe it would be more efficient just to have a quick flag for this? for (dvar = driver->variables.first; dvar; dvar = dvar->next) { - DRIVER_TARGETS_USED_LOOPER(dvar) + DRIVER_TARGETS_USED_LOOPER_BEGIN(dvar) { if (dtar->flag & DTAR_FLAG_INVALID) return true; } - DRIVER_TARGETS_LOOPER_END + DRIVER_TARGETS_LOOPER_END; } } diff --git a/source/blender/editors/armature/armature_relations.c b/source/blender/editors/armature/armature_relations.c index 5d582a24f1c..e4ce1d58208 100644 --- a/source/blender/editors/armature/armature_relations.c +++ b/source/blender/editors/armature/armature_relations.c @@ -163,7 +163,7 @@ static void joined_armature_fix_animdata_cb(ID *id, FCurve *fcu, void *user_data /* Fix driver references to invalid ID's */ for (dvar = driver->variables.first; dvar; dvar = dvar->next) { /* only change the used targets, since the others will need fixing manually anyway */ - DRIVER_TARGETS_USED_LOOPER(dvar) + DRIVER_TARGETS_USED_LOOPER_BEGIN(dvar) { /* change the ID's used... */ if (dtar->id == src_id) { @@ -196,7 +196,7 @@ static void joined_armature_fix_animdata_cb(ID *id, FCurve *fcu, void *user_data } } } - DRIVER_TARGETS_LOOPER_END + DRIVER_TARGETS_LOOPER_END; } } } diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index e8106f8038e..ebd6904fa56 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -988,7 +988,7 @@ static TreeElement *outliner_add_element(SpaceOops *soops, ListBase *lb, void *i for (dvar = driver->variables.first; dvar; dvar = dvar->next) { /* loop over all targets used here */ - DRIVER_TARGETS_USED_LOOPER(dvar) + DRIVER_TARGETS_USED_LOOPER_BEGIN(dvar) { if (lastadded != dtar->id) { // XXX this lastadded check is rather lame, and also fails quite badly... @@ -996,7 +996,7 @@ static TreeElement *outliner_add_element(SpaceOops *soops, ListBase *lb, void *i lastadded = dtar->id; } } - DRIVER_TARGETS_LOOPER_END + DRIVER_TARGETS_LOOPER_END; } } } diff --git a/source/gameengine/Converter/BL_ShapeDeformer.cpp b/source/gameengine/Converter/BL_ShapeDeformer.cpp index 7653bb3f99b..ca32e49ef5d 100644 --- a/source/gameengine/Converter/BL_ShapeDeformer.cpp +++ b/source/gameengine/Converter/BL_ShapeDeformer.cpp @@ -137,14 +137,14 @@ bool BL_ShapeDeformer::LoadShapeDrivers(KX_GameObject* parent) DriverVar *dvar; for (dvar = (DriverVar*)fcu->driver->variables.first; dvar; dvar = (DriverVar*)dvar->next) { - DRIVER_TARGETS_USED_LOOPER(dvar) + DRIVER_TARGETS_USED_LOOPER_BEGIN(dvar) { if (dtar->id) { if ((Object*)dtar->id == arma->GetOrigArmatureObject()) dtar->id = (ID*)arma->GetArmatureObject(); } } - DRIVER_TARGETS_LOOPER_END + DRIVER_TARGETS_LOOPER_END; } } } -- cgit v1.2.3