[Bf-blender-cvs] [678b76d99ae] master: Correct error in 405bff7fd8ed5df8d44a1362763fac7c00e2060b

Campbell Barton noreply at git.blender.org
Thu Apr 14 09:03:44 CEST 2022


Commit: 678b76d99ae5f918777a5706490b680d709d081d
Author: Campbell Barton
Date:   Thu Apr 14 17:02:08 2022 +1000
Branches: master
https://developer.blender.org/rB678b76d99ae5f918777a5706490b680d709d081d

Correct error in 405bff7fd8ed5df8d44a1362763fac7c00e2060b

Was adding 1 to dietime twice in init_particle_interpolation.

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

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

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

diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 500596e6d42..cc4738b1faa 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -1386,7 +1386,7 @@ static void init_particle_interpolation(Object *ob,
 
     if (get_pointcache_times_for_particle(pind->cache, pa - psys->particles, &start, &dietime)) {
       pind->birthtime = MAX2(pind->birthtime, start);
-      pind->dietime = MIN2(pind->dietime, dietime + 1);
+      pind->dietime = MIN2(pind->dietime, dietime);
     }
   }
   else {



More information about the Bf-blender-cvs mailing list