diff options
author | Stefan Werner <stefan.werner@tangent-animation.com> | 2021-08-21 23:03:31 +0300 |
---|---|---|
committer | Stefan Werner <stefan.werner@tangent-animation.com> | 2021-08-21 23:03:31 +0300 |
commit | c5b56a525cd6113caa2bd3ec7bfb91fe4a04513a (patch) | |
tree | 77dae5ae2fbeccf6703034c94ad3e1f3aa81140b /intern/cycles/blender/blender_particles.cpp | |
parent | 34e8d79c3edbc58fd242cec0c1f2bed4e43855af (diff) | |
parent | 67c29bc5a273b66e278bd20c18187b425acf1869 (diff) |
Merge branch 'master' into cycles_texture_cachecycles_texture_cache
Diffstat (limited to 'intern/cycles/blender/blender_particles.cpp')
-rw-r--r-- | intern/cycles/blender/blender_particles.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_particles.cpp b/intern/cycles/blender/blender_particles.cpp index ae43dae4dc1..206ee24a093 100644 --- a/intern/cycles/blender/blender_particles.cpp +++ b/intern/cycles/blender/blender_particles.cpp @@ -71,7 +71,7 @@ bool BlenderSync::sync_dupli_particle(BL::Object &b_ob, Particle pa; pa.index = persistent_id[0]; - pa.age = b_scene.frame_current() - b_pa.birth_time(); + pa.age = b_scene.frame_current_final() - b_pa.birth_time(); pa.lifetime = b_pa.lifetime(); pa.location = get_float3(b_pa.location()); pa.rotation = get_float4(b_pa.rotation()); |