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:
authorSybren A. Stüvel <sybren@stuvel.eu>2018-05-16 17:09:48 +0300
committerSybren A. Stüvel <sybren@stuvel.eu>2018-05-16 17:09:52 +0300
commit739c3e8102b3b251795987242a1ba8bb1564cf84 (patch)
tree10413fa91c2fdf59c8ef5429a79a7e9b96b6b307 /source/blender/blenkernel
parenteacf63c96f7ce89a3e374b41fbaa036eabc13147 (diff)
Particle System: use DEG to get current time in psys_get_particle_state()
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/particle.c2
1 files changed, 1 insertions, 1 deletions
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)