Commit: 2c056a1e2e7f9069943625f399bbc5b7376aa9f8
Author: Martin Felke
Date: Sun Mar 10 10:51:03 2019 +0100
Branches: temp-fracture-modifier-2.8
https://developer.blender.org/rB2c056a1e2e7f9069943625f399bbc5b7376aa9f8
why interrupt and reset the particle sim, if a modifier after it changes ?
Makes not much sense.
in this case, changing the parameters of metaball remesh after particlesystem
during animation caused strange resets.
===================================================================
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 7c6ebe79b58..7072cb9ad1b 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -3939,7 +3939,7 @@ static void system_step(ParticleSimulationData *sim,
float cfra, const bool use_
BKE_ptcache_id_time(pid, sim->scene, 0.0f, &startframe,
&endframe, NULL);
/* clear everything on start frame, or when psys needs full
reset! */
- if ((cfra == startframe) || (psys->recalc &
ID_RECALC_PSYS_RESET)) {
+ if ((cfra == startframe) /*|| (psys->recalc &
ID_RECALC_PSYS_RESET)*/) {
BKE_ptcache_id_reset(sim->scene, pid,
PTCACHE_RESET_OUTDATED);
BKE_ptcache_validate(cache, startframe);
cache->flag &= ~PTCACHE_REDO_NEEDED;
@@ -3972,7 +3972,7 @@ static void system_step(ParticleSimulationData *sim,
float cfra, const bool use_
/* 2. try to read from the cache */
if (pid) {
- int cache_result = BKE_ptcache_read(pid, cache_cfra, true);
+ int cache_result = BKE_ptcache_read(pid, cache_cfra, false);
if (ELEM(cache_result, PTCACHE_READ_EXACT,
PTCACHE_READ_INTERPOLATED)) {
cached_step(sim, cfra, use_render_params);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
