Merge branch 'master' into blender2.8
[blender.git] / source / blender / blenkernel / intern / particle.c
index 6ceae2fdc2d2d642bff49d68607885fe97e2e46e..5a9722a867c5394d0e5e194a23d6f2e0ed9622b6 100644 (file)
@@ -442,8 +442,8 @@ void BKE_particlesettings_free(ParticleSettings *part)
        if (part->twistcurve)
                curvemapping_free(part->twistcurve);
 
-       free_partdeflect(part->pd);
-       free_partdeflect(part->pd2);
+       BKE_partdeflect_free(part->pd);
+       BKE_partdeflect_free(part->pd2);
 
        MEM_SAFE_FREE(part->effector_weights);
 
@@ -3212,7 +3212,7 @@ static void default_particle_settings(ParticleSettings *part)
        part->draw_col = PART_DRAW_COL_MAT;
 
        if (!part->effector_weights)
-               part->effector_weights = BKE_add_effector_weights(NULL);
+               part->effector_weights = BKE_effector_add_weights(NULL);
 
        part->omat = 1;
        part->use_modifier_stack = false;