Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Tönne <lukas.toenne@gmail.com>2015-03-01 17:37:55 +0300
committerLukas Tönne <lukas.toenne@gmail.com>2015-03-01 17:37:55 +0300
commitf076eb482b3e2e169b2bbf7ca609f5e747f9709f (patch)
tree1ab551d1566c6797c3fbe1913dbc401200634fcf /source/blender/blenkernel/intern/particle_system.c
parentdfefd3683710a4bf70cf90c874b65a9c118d2c06 (diff)
Use the old double-step collision method only for cloth.
This method does not work for hair anyway. Even though hair collision needs work at this point, it's still better than nothing.
Diffstat (limited to 'source/blender/blenkernel/intern/particle_system.c')
-rw-r--r--source/blender/blenkernel/intern/particle_system.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index cacaea39877..b7ebcfa9b0b 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -3128,7 +3128,6 @@ static void do_hair_dynamics(ParticleSimulationData *sim)
psys->clmd->sim_parms->vel_damping = 1.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;
}
/* count simulated points */