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/BKE_effect.h | |
| parent | e1b8645c6adfb925c0c16abfb0241968d58081b4 (diff) | |
| parent | c00e1f68e9b81cc4972dabb869d1b6993a3bc767 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/BKE_effect.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_effect.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_effect.h b/source/blender/blenkernel/BKE_effect.h index 3d4154c572b..9ba1bbdee07 100644 --- a/source/blender/blenkernel/BKE_effect.h +++ b/source/blender/blenkernel/BKE_effect.h @@ -47,8 +47,7 @@ struct ParticleKey; struct Depsgraph; struct ViewLayer; -struct EffectorWeights *BKE_add_effector_weights(struct Collection *collection); -struct PartDeflect *object_add_collision_fields(int type); +struct EffectorWeights *BKE_effector_add_weights(struct Collection *collection); /* Input to effector code */ typedef struct EffectedPoint { @@ -120,7 +119,9 @@ typedef struct EffectorRelation { struct PartDeflect *pd; } EffectorRelation; -void free_partdeflect(struct PartDeflect *pd); + +struct PartDeflect *BKE_partdeflect_new(int type); +void BKE_partdeflect_free(struct PartDeflect *pd); struct ListBase *BKE_effector_relations_create( struct Depsgraph *depsgraph, |