[Bf-blender-cvs] [5afba30c69b] blender-v2.83-release: Fix T75987: crash entering edit mode with keyed particles

Brecht Van Lommel noreply at git.blender.org
Thu Apr 23 14:53:05 CEST 2020


Commit: 5afba30c69b1fc67bbf071efe8ac70c4ec9ec28b
Author: Brecht Van Lommel
Date:   Thu Apr 23 14:51:07 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB5afba30c69b1fc67bbf071efe8ac70c4ec9ec28b

Fix T75987: crash entering edit mode with keyed particles

===================================================================

M	source/blender/blenkernel/intern/particle_system.c

===================================================================

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;



More information about the Bf-blender-cvs mailing list