Merge branch 'master' into blender2.8
[blender.git] / source / blender / blenkernel / intern / anim_sys.c
index 7693485e042bb595fdd45fde2e15bf74dea9abd4..8e8000f3ea07cca809dbe8290ba9e30cf0fb3497 100644 (file)
@@ -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;
                        }
                }
        }