diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-03-14 14:03:04 +0400 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2014-03-14 14:03:04 +0400 |
commit | ade6646755224ce9178d280738727c1a968b28b6 (patch) | |
tree | 5512186542ee67fb87d757c00ad324f6c88c5e55 /source | |
parent | a2057005f28a895a7334dfef6c25450aff33fe49 (diff) |
Fix T39180: Particle with fluid physics unstable.
Fluid particles use the particle system's bvhtree structure, which is a
runtime BVH tree. This was not reset properly on copying objects/psys,
which lead to concurrent access in threaded depsgraph updates and memory
corruption.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 43dbc34f3d3..dbc8e4df4c4 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1282,6 +1282,7 @@ static ParticleSystem *copy_particlesystem(ParticleSystem *psys) psysn->pdd = NULL; psysn->effectors = NULL; psysn->tree = NULL; + psysn->bvhtree = NULL; BLI_listbase_clear(&psysn->pathcachebufs); BLI_listbase_clear(&psysn->childcachebufs); |