From f076eb482b3e2e169b2bbf7ca609f5e747f9709f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20T=C3=B6nne?= Date: Sun, 1 Mar 2015 15:37:55 +0100 Subject: 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. --- source/blender/blenkernel/intern/particle_system.c | 1 - 1 file changed, 1 deletion(-) (limited to 'source/blender/blenkernel/intern/particle_system.c') 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 */ -- cgit v1.2.3