diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-12-02 06:15:43 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-02 06:16:09 +0300 |
| commit | 2e392a0fdc0975e500d7ea07bfbfc781f5ddd190 (patch) | |
| tree | 92d23413d4573fb86f8e3da97e2f0a3f8d55f68d /source/blender/blenkernel/intern/particle.c | |
| parent | e1b8645c6adfb925c0c16abfb0241968d58081b4 (diff) | |
| parent | c00e1f68e9b81cc4972dabb869d1b6993a3bc767 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/particle.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 6ceae2fdc2d..5a9722a867c 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -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; |