diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-03-11 15:38:11 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-03-26 16:13:34 +0300 |
| commit | 0fbad24bf2efce961d725e5e188a0a9d1bccf3dd (patch) | |
| tree | 89056350a68f0b11db90822ab818a04349a4d08e /source/blender/blenkernel/intern/particle_system.c | |
| parent | ad65238df703b20ad4b758d2e43590c02f2406f6 (diff) | |
Removed current implementation of cache reading from various parts of
BKE (DerivedMesh, particles, cloth).
The new cache implementation will be used for constructing dupli data
instead, bypassing the complexities of the modifier stack.
Conflicts:
source/blender/blenkernel/intern/cloth.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_system.c
Conflicts:
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_system.c
Diffstat (limited to 'source/blender/blenkernel/intern/particle_system.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 80c15b615c4..5a263e24fc4 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -3161,6 +3161,7 @@ static void do_hair_dynamics(ParticleSimulationData *sim) if (psys->hair_out_dm) psys->hair_out_dm->release(psys->hair_out_dm); + psys->clmd->point_cache = psys->pointcache; /* for hair sim we replace the internal cloth effector weights temporarily * to use the particle settings */ @@ -3171,7 +3172,7 @@ static void do_hair_dynamics(ParticleSimulationData *sim) psys->hair_out_dm = CDDM_copy(psys->hair_in_dm); psys->hair_out_dm->getVertCos(psys->hair_out_dm, deformedVerts); - clothModifier_do(psys->clmd, sim->scene, sim->ob, psys->hair_in_dm, deformedVerts, psys->renderdata != NULL); + clothModifier_do(psys->clmd, sim->scene, sim->ob, psys->hair_in_dm, deformedVerts); CDDM_apply_vert_coords(psys->hair_out_dm, deformedVerts); |