Merge branch 'master' into blender2.8
[blender.git] / source / blender / blenloader / intern / readfile.c
index acf6ead7d962fc1d5e4a88e02c387bf4f1b69c55..076370c887743fc376d40b2f0d598430b6a5cf53 100644 (file)
@@ -4332,7 +4332,7 @@ static void lib_link_particlesettings(FileData *fd, Main *main)
                                part->effector_weights->group = newlibadr(fd, part->id.lib, part->effector_weights->group);
                        }
                        else {
-                               part->effector_weights = BKE_add_effector_weights(part->eff_group);
+                               part->effector_weights = BKE_effector_add_weights(part->eff_group);
                        }
 
                        if (part->dupliweights.first && part->dup_group) {
@@ -4411,7 +4411,7 @@ static void direct_link_particlesettings(FileData *fd, ParticleSettings *part)
 
        part->effector_weights = newdataadr(fd, part->effector_weights);
        if (!part->effector_weights)
-               part->effector_weights = BKE_add_effector_weights(part->eff_group);
+               part->effector_weights = BKE_effector_add_weights(part->eff_group);
 
        link_list(fd, &part->dupliweights);
 
@@ -5155,7 +5155,7 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb)
                                clmd->sim_parms->effector_weights = newdataadr(fd, clmd->sim_parms->effector_weights);
 
                                if (!clmd->sim_parms->effector_weights) {
-                                       clmd->sim_parms->effector_weights = BKE_add_effector_weights(NULL);
+                                       clmd->sim_parms->effector_weights = BKE_effector_add_weights(NULL);
                                }
                        }
 
@@ -5197,7 +5197,7 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb)
 
                                smd->domain->effector_weights = newdataadr(fd, smd->domain->effector_weights);
                                if (!smd->domain->effector_weights)
-                                       smd->domain->effector_weights = BKE_add_effector_weights(NULL);
+                                       smd->domain->effector_weights = BKE_effector_add_weights(NULL);
 
                                direct_link_pointcache_list(fd, &(smd->domain->ptcaches[0]), &(smd->domain->point_cache[0]), 1);
 
@@ -5264,7 +5264,7 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb)
                                                direct_link_pointcache_list(fd, &(surface->ptcaches), &(surface->pointcache), 1);
 
                                                if (!(surface->effector_weights = newdataadr(fd, surface->effector_weights)))
-                                                       surface->effector_weights = BKE_add_effector_weights(NULL);
+                                                       surface->effector_weights = BKE_effector_add_weights(NULL);
                                        }
                                }
                        }
@@ -5625,7 +5625,7 @@ static void direct_link_object(FileData *fd, Object *ob)
 
                sb->effector_weights = newdataadr(fd, sb->effector_weights);
                if (!sb->effector_weights)
-                       sb->effector_weights = BKE_add_effector_weights(NULL);
+                       sb->effector_weights = BKE_effector_add_weights(NULL);
 
                sb->shared = newdataadr(fd, sb->shared);
                if (sb->shared == NULL) {
@@ -6516,7 +6516,7 @@ static void direct_link_scene(FileData *fd, Scene *sce)
                /* set effector weights */
                rbw->effector_weights = newdataadr(fd, rbw->effector_weights);
                if (!rbw->effector_weights)
-                       rbw->effector_weights = BKE_add_effector_weights(NULL);
+                       rbw->effector_weights = BKE_effector_add_weights(NULL);
        }
 
        sce->preview = direct_link_preview_image(fd, sce->preview);