[Bf-blender-cvs] [8cc679b] alembic_pointcache: Fixed test for "render" eval mode for hair dynamics.

Lukas Tönne noreply at git.blender.org
Thu Mar 5 17:46:58 CET 2015


Commit: 8cc679b8d674bbce607dd900d1731d15734ce332
Author: Lukas Tönne
Date:   Thu Mar 5 17:46:17 2015 +0100
Branches: alembic_pointcache
https://developer.blender.org/rB8cc679b8d674bbce607dd900d1731d15734ce332

Fixed test for "render" eval mode for hair dynamics.

This is totally weird and convoluted, no idea if correct.

===================================================================

M	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 d317627..512c08b 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -3172,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, 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);




More information about the Bf-blender-cvs mailing list