diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-30 07:11:32 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-30 07:11:32 +0300 |
| commit | 8f8c23865922a77458f548752ffccb048b96ea5b (patch) | |
| tree | 27766448763f940c6c736de51c4ac4f1942ce920 /source/blender/editors/armature/armature_relations.c | |
| parent | c312cc171b3e85306fb4c0d67f260bac14af2bfe (diff) | |
| parent | 8c85f1316cdebc636f0210478a8a36b9475269fd (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/armature/armature_relations.c')
| -rw-r--r-- | source/blender/editors/armature/armature_relations.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/armature/armature_relations.c b/source/blender/editors/armature/armature_relations.c index ee65d76cae7..16eb67c9df2 100644 --- a/source/blender/editors/armature/armature_relations.c +++ b/source/blender/editors/armature/armature_relations.c @@ -166,7 +166,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) { @@ -199,7 +199,7 @@ static void joined_armature_fix_animdata_cb(ID *id, FCurve *fcu, void *user_data } } } - DRIVER_TARGETS_LOOPER_END + DRIVER_TARGETS_LOOPER_END; } } } |