diff options
| author | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2021-08-13 14:31:21 +0300 |
|---|---|---|
| committer | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2021-08-17 22:41:18 +0300 |
| commit | 23132fcdc136d1238d9980c2a9bf6d058e846cc7 (patch) | |
| tree | cfcc3668e897626a47fb46b8dee38f120aeece86 | |
| parent | 60d6333b80472ca9eb2e1ab659da0fa2572d0a8b (diff) | |
Fix T77307: Particle Info Node Does Not Consider Time Remapping
`frame_current_final()` should be used to access the Scene time after
remapping, which also matches how the particles system handles time.
Reviewed By: brecht
Maniphest Tasks: T77307
Differential Revision: https://developer.blender.org/D12239
| -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()); |