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/depsgraph/intern/depsgraph_types.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/depsgraph/intern/depsgraph_types.h')
-rw-r--r-- | source/blender/depsgraph/intern/depsgraph_types.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_types.h b/source/blender/depsgraph/intern/depsgraph_types.h index b4a0dde1f35..3aa204490eb 100644 --- a/source/blender/depsgraph/intern/depsgraph_types.h +++ b/source/blender/depsgraph/intern/depsgraph_types.h @@ -240,7 +240,6 @@ typedef enum eDepsOperation_Code { DEG_OPCODE_PARTICLE_SYSTEM_EVAL_INIT, DEG_OPCODE_PARTICLE_SYSTEM_EVAL, DEG_OPCODE_PARTICLE_SETTINGS_EVAL, - DEG_OPCODE_PARTICLE_SETTINGS_RECALC_CLEAR, /* Point Cache. ------------------------------------- */ DEG_OPCODE_POINT_CACHE_RESET, |