From 44cd24a9cee9ffb14b5d26a622f2158f55e008ba Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 28 Mar 2018 17:32:51 +0200 Subject: 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. --- source/blender/blenkernel/BKE_particle.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'source/blender/blenkernel/BKE_particle.h') 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); -- cgit v1.2.3