Merge branch 'master' into blender2.8
[blender.git] / source / blender / blenloader / intern / readfile.c
index 76162beb1cbfbc8c20fea1e08919a779ef0b67c1..fe4d38e16188f46d9947ece3a4e3df45fcca7bf5 100644 (file)
@@ -2591,7 +2591,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)
@@ -2599,7 +2599,7 @@ static void lib_link_fcurves(FileData *fd, ID *id, ListBase *list)
                                        else
                                                dtar->id = NULL;
                                }
-                               DRIVER_TARGETS_LOOPER_END
+                               DRIVER_TARGETS_LOOPER_END;
                        }
                }
 
@@ -2694,7 +2694,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)
@@ -2702,7 +2702,7 @@ static void direct_link_fcurves(FileData *fd, ListBase *list)
                                        else
                                                dtar->rna_path = NULL;
                                }
-                               DRIVER_TARGETS_LOOPER_END
+                               DRIVER_TARGETS_LOOPER_END;
                        }
                }
 
@@ -9426,12 +9426,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;
                        }
                }