diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-28 18:32:51 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-29 13:41:11 +0300 |
commit | 44cd24a9cee9ffb14b5d26a622f2158f55e008ba (patch) | |
tree | 4ff9740ad9fe6a99797c9b0a0d08130efaf13ed5 /source/blender/blenkernel/BKE_particle.h | |
parent | 526719bccb8bc8a592ad951cb3a137ce56fa4834 (diff) |
Particles: Remove dedicated recalc field from ParticleSettings
Use more generic id->recalc flag.
Also sanitize flag flush from settings to particle system.
Need to do such flush before triggering point cache reset, since
point cache reset will do some logic based on what flags are set.
This will solve crash caused by threaded update which will set
some bitflags while point cache reset is in progress.
Diffstat (limited to 'source/blender/blenkernel/BKE_particle.h')
-rw-r--r-- | source/blender/blenkernel/BKE_particle.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h index 2db4126057a..06c74d93e7c 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -485,11 +485,6 @@ typedef struct ParticleRenderData { struct EvaluationContext; -void BKE_particle_system_settings_eval(const struct EvaluationContext *eval_ctx, - struct ParticleSystem *psys); -void BKE_particle_system_settings_recalc_clear(struct EvaluationContext *UNUSED(eval_ctx), - struct ParticleSettings *particle_settings); - void BKE_particle_system_eval_init(const struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob); |