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/blenkernel/intern/anim_sys.c | |
| parent | c312cc171b3e85306fb4c0d67f260bac14af2bfe (diff) | |
| parent | 8c85f1316cdebc636f0210478a8a36b9475269fd (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/anim_sys.c')
| -rw-r--r-- | source/blender/blenkernel/intern/anim_sys.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index 7693485e042..8e8000f3ea0 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -405,13 +405,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; } } } @@ -754,7 +754,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) @@ -769,7 +769,7 @@ static void drivers_path_rename_fix(ID *owner_id, ID *ref_id, const char *prefix } } } - DRIVER_TARGETS_LOOPER_END + DRIVER_TARGETS_LOOPER_END; } } } |