[Bf-blender-cvs] [1d0b6c6] gooseberry: Fixed test for "render" eval mode for hair dynamics.

[Lukas Tönne]

Commit: 1d0b6c6e7cb4238ea59dd2c316171526dd417ff4
Author: Lukas Tönne
Date:   Thu Mar 5 17:46:17 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB1d0b6c6e7cb4238ea59dd2c316171526dd417ff4

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

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

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 6e77ebf..d5b1119 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -3431,7 +3431,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);
 #ifdef USE_PARTICLE_PREVIEW
 	hair_deform_preview_hairs(sim, deformedVerts, psys->clmd->roots);
 #endif