diff options
| author | Jacques Lucke <jacques@blender.org> | 2020-04-23 16:15:04 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2020-04-23 16:15:04 +0300 |
| commit | 1fce2ea743846a3301cf254595fd5884dbfb4053 (patch) | |
| tree | c85eb15338633785f6f613b790bde1e61073582b /source/blender/blenkernel/intern/particle_system.c | |
| parent | 1c84cd81985abb76572fcedecc768fce1631129c (diff) | |
| parent | 694c0547c21aa3a5087c0dd4323624358135f4ef (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/blenkernel/intern/particle_system.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 14b1ef7b87f..83f1dca4b8c 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -1258,7 +1258,8 @@ static void set_keyed_keys(ParticleSimulationData *sim) key = pa->keys + k; key->time = -1.0; /* use current time */ - psys_get_particle_state(&ksim, p % ksim.psys->totpart, key, 1); + const int p_ksim = (ksim.psys->totpart) ? p % ksim.psys->totpart : 0; + psys_get_particle_state(&ksim, p_ksim, key, 1); if (psys->flag & PSYS_KEYED_TIMING) { key->time = pa->time + pt->time; |