diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2020-04-23 15:51:07 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-04-23 15:51:41 +0300 |
| commit | 5afba30c69b1fc67bbf071efe8ac70c4ec9ec28b (patch) | |
| tree | f1f8b8129ad64219b38ca315988ace4528099d46 /source/blender/blenkernel | |
| parent | a0652430d0f824adb26de9d2ae22f80fec721f4e (diff) | |
Fix T75987: crash entering edit mode with keyed particles
Diffstat (limited to 'source/blender/blenkernel')
| -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 cc49f500a5f..f7400264131 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; |