Better fix for #32846. Instead of using time change or object recalc condition, set an explicit object flag to disable particle system modifier update during dupli list creation. This is more transparent and should prevent issues with hair path generation being skipped.

1 files changed, 1 insertions, 6 deletions

diff --git a/source/blender/modifiers/intern/MOD_particlesystem.c b/source/blender/modifiers/intern/MOD_particlesystem.c
index c4db9375a4a..6d6c1361566 100644
--- a/source/blender/modifiers/intern/MOD_particlesystem.c
+++ b/source/blender/modifiers/intern/MOD_particlesystem.c
@@ -190,12 +190,7 @@ static void deformVerts(ModifierData *md, Object *ob,
 		psmd->totdmface = psmd->dm->getNumTessFaces(psmd->dm);
 	}
 
-	/* skip the particle update if no timestep is performed or initialization required.
-	 * XXX this is a workaround for bug #32846, which is caused by modifier updates
-	 * during dupli-list generation (in cycles). The dupli-list generation can temporarily change
-	 * the ob->obmat matrix, which in turn leads to wrong particle states if used for reset ...
-	 */
-	if (psys->cfra != cfra || psys->recalc) {
+	if (!(ob->transflag & OB_NO_PSYS_UPDATE)) {
 		psmd->flag &= ~eParticleSystemFlag_psys_updated;
 		particle_system_update(md->scene, ob, psys);
 		psmd->flag |= eParticleSystemFlag_psys_updated;