[Bf-blender-cvs] [739c3e8102b] blender2.8: Particle System: use DEG to get current time in psys_get_particle_state()

Sybren A. Stüvel noreply at git.blender.org
Wed May 16 16:10:45 CEST 2018


Commit: 739c3e8102b3b251795987242a1ba8bb1564cf84
Author: Sybren A. Stüvel
Date:   Wed May 16 16:09:48 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB739c3e8102b3b251795987242a1ba8bb1564cf84

Particle System: use DEG to get current time in psys_get_particle_state()

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

M	source/blender/blenkernel/intern/particle.c

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

diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 4d07f212c97..ed09e89a770 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -3867,7 +3867,7 @@ int psys_get_particle_state(ParticleSimulationData *sim, int p, ParticleKey *sta
 	float timestep = psys_get_timestep(sim);
 
 	/* negative time means "use current time" */
-	cfra = state->time > 0 ? state->time : BKE_scene_frame_get(sim->scene);
+	cfra = state->time > 0 ? state->time : DEG_get_ctime(sim->depsgraph);
 
 	if (p >= totpart) {
 		if (!psys->totchild)



More information about the Bf-blender-cvs mailing list