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/effect.c | |
| parent | e1b8645c6adfb925c0c16abfb0241968d58081b4 (diff) | |
| parent | c00e1f68e9b81cc4972dabb869d1b6993a3bc767 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/effect.c')
| -rw-r--r-- | source/blender/blenkernel/intern/effect.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index f54082de153..0c8a47be4b4 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -87,7 +87,7 @@ #include <string.h> #endif // WITH_MOD_FLUID -EffectorWeights *BKE_add_effector_weights(Collection *collection) +EffectorWeights *BKE_effector_add_weights(Collection *collection) { EffectorWeights *weights = MEM_callocN(sizeof(EffectorWeights), "EffectorWeights"); int i; @@ -102,7 +102,7 @@ EffectorWeights *BKE_add_effector_weights(Collection *collection) return weights; } -PartDeflect *object_add_collision_fields(int type) +PartDeflect *BKE_partdeflect_new(int type) { PartDeflect *pd; @@ -140,7 +140,7 @@ PartDeflect *object_add_collision_fields(int type) /************************ PARTICLES ***************************/ -void free_partdeflect(PartDeflect *pd) +void BKE_partdeflect_free(PartDeflect *pd) { if (!pd) { return; |