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-03 21:29:06 +0300
committerLukas Tönne <lukas.toenne@gmail.com>2015-03-26 16:12:45 +0300
commit91ec385a0d642c256af0dc067cdc2773062f096e (patch)
tree9bf409e00fde2fb30ed590b2668c101de95196e5 /source/blender/blenkernel/intern/particle_system.c
parent81c720f76ed4979bef6e9aa4f64f643deec9c243 (diff)
Render/Viewport evaluation mode for cache libraries.
This designates a cache library to be used either for the viewport or for renders. A "Render" cache library will evaluate modifiers with render settings and a "Viewport" cache library will use viewport (realtime) settings. When reading the cache, the library will only be used for the assigned purpose, i.e. a Render cache does not work for viewport caching and vice-versa (although a cache can be baked for one setting and then switched afterward). Note that render results will never be visible in the realtime viewport due to the way object evaluation is handled in Blender at this point (render settings are only evaluated explicitly during renderer sync). 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.c2
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 2c164f302bc..16b05c4377e 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);
+ clothModifier_do(psys->clmd, sim->scene, sim->ob, psys->hair_in_dm, deformedVerts, sim->psmd ? (sim->psmd->modifier.mode & eModifierMode_Render) : false);
CDDM_apply_vert_coords(psys->hair_out_dm, deformedVerts);