diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-07-21 12:16:37 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-07-21 12:18:02 +0300 |
| commit | 9fbef5d5d5cd172aa8225134213fb0c3eeea1009 (patch) | |
| tree | 401bec7b8d0d069a8769e77c1951cdd81ecc943c /source/blender/blenkernel/BKE_particle.h | |
| parent | c425653f1647d094583b29f004eee5cd4f6e9446 (diff) | |
| parent | 4d67034076f58905f03d947af7cfe3455b4f33ab (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/BKE_particle.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_particle.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h index f318787d954..22a0290f364 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -478,10 +478,9 @@ void BKE_particle_system_settings_eval(struct EvaluationContext *eval_ctx, void BKE_particle_system_settings_recalc_clear(struct EvaluationContext *UNUSED(eval_ctx), struct ParticleSettings *particle_settings); -void BKE_particle_system_eval(struct EvaluationContext *eval_ctx, - struct Scene *scene, - struct Object *ob, - struct ParticleSystem *psys); +void BKE_particle_system_eval_init(struct EvaluationContext *eval_ctx, + struct Scene *scene, + struct Object *ob); #endif |