diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-03-05 19:46:17 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-03-26 16:13:04 +0300 |
| commit | d49c83eebf6d23dc75740dafb43bbd6a47930278 (patch) | |
| tree | 5036b0c70642668a8f70e5bb13ca91d6e04b17db /source/blender/blenkernel/intern/particle_system.c | |
| parent | 98e0de16ab402e144a4007fa6a5d1299b8380f7d (diff) | |
Fixed test for "render" eval mode for hair dynamics.
This is totally weird and convoluted, no idea if correct.
Conflicts:
source/blender/blenkernel/intern/particle_system.c
Conflicts:
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 16b05c4377e..80c15b615c4 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -3171,7 +3171,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, sim->psmd ? (sim->psmd->modifier.mode & eModifierMode_Render) : false); + clothModifier_do(psys->clmd, sim->scene, sim->ob, psys->hair_in_dm, deformedVerts, psys->renderdata != NULL); CDDM_apply_vert_coords(psys->hair_out_dm, deformedVerts); |