[Bf-blender-cvs] [ade6646] master: Fix T39180: Particle with fluid physics unstable.
Lukas Tönne
noreply at git.blender.org
Fri Mar 14 11:10:47 CET 2014
Commit: ade6646755224ce9178d280738727c1a968b28b6
Author: Lukas Tönne
Date: Fri Mar 14 11:03:04 2014 +0100
https://developer.blender.org/rBade6646755224ce9178d280738727c1a968b28b6
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.
===================================================================
M source/blender/blenkernel/intern/object.c
===================================================================
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 43dbc34..dbc8e4d 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);
More information about the Bf-blender-cvs
mailing list