diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-08-30 17:23:40 +0400 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-01-20 11:29:21 +0300 |
| commit | 5a43e8493e3851d076365dc106e0fa18ab21eebe (patch) | |
| tree | 76616a2bee4f887810400063297fe362ea30be14 /source/blender/makesrna/intern/rna_particle.c | |
| parent | ba8b8ec99870e61ba7496b3c55795e5acf9bd573 (diff) | |
Some initial collision code, without actual response forces still.
This is still using the old BVH tree collision methods to generate
contact points, similar to what cloth does. This should be replaced
by a Bullet collision check, but generating contacts in this way is
easier for now, and lets us test responses and stability (although in
more complex collision cases the BVH method fails utterly, beside being
terribly inefficient with many colliders).
Diffstat (limited to 'source/blender/makesrna/intern/rna_particle.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_particle.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index dd32bb189e2..b12cc85c6e4 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -716,6 +716,7 @@ static void rna_Particle_hair_dynamics(Main *bmain, Scene *scene, PointerRNA *pt psys->clmd->sim_parms->goalspring = 0.0f; psys->clmd->sim_parms->flags |= CLOTH_SIMSETTINGS_FLAG_GOAL | CLOTH_SIMSETTINGS_FLAG_NO_SPRING_COMPRESS; psys->clmd->coll_parms->flags &= ~CLOTH_COLLSETTINGS_FLAG_SELF; + psys->clmd->coll_parms->flags |= CLOTH_COLLSETTINGS_FLAG_POINTS; rna_Particle_redo(bmain, scene, ptr); } else |