blender
/
blender
135
420
Fork 604
Code Issues 6.4k Pull Requests 758 Projects 19 Wiki Activity

Fix #68436: External Particle Disk Cache Playback Is Broken #117401

Merged
Philipp Oeser merged 2 commits from lichtwerk/blender:68436_b into main 2024-01-23 09:37:52 +01:00
Conversation 2 Commits 2 Files Changed 1 +31 -2
1 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b07950fe79 - Show all commits

33
source/blender/blenkernel/intern/pointcache.cc
View File

@ -61,6 +61,8 @@
#include "BLO_read_write.hh"
#include "DEG_depsgraph_query.hh"
#include "BIK_api.h"
#ifdef WITH_BULLET
@ -3348,6 +3350,7 @@ void BKE_ptcache_bake(PTCacheBaker *baker)
}
/* clear baking flag */
PTCacheID pid_eval;
Brecht Van Lommel commented 2024-01-22 12:09:56 +01:00
Outdated
Review
Copy Link

Move inside if (pid->type == PTCACHE_TYPE_PARTICLES). Prefer to have variables declared as close as possible to their first use.

Move inside `if (pid->type == PTCACHE_TYPE_PARTICLES)`. Prefer to have variables declared as close as possible to their first use.
if (pid && cache) {
cache->flag &= ~(PTCACHE_BAKING | PTCACHE_REDO_NEEDED);
cache->flag |= PTCACHE_SIMULATION_VALID;
@ -3355,7 +3358,20 @@ void BKE_ptcache_bake(PTCacheBaker *baker)
cache->flag |= PTCACHE_BAKED;
/* write info file */
if (cache->flag & PTCACHE_DISK_CACHE) {
BKE_ptcache_write(pid, 0);
if (pid->type == PTCACHE_TYPE_PARTICLES) {
/* Since writing this from outside the bake job, make sure the ParticleSystem and
* PTCacheID is in a fully evaluated state. */
ID *id = pid->owner_id;
Object *ob = (GS(id->name) == ID_OB) ? reinterpret_cast<Object *>(id) : nullptr;
lichtwerk marked this conversation as resolved
Brecht Van Lommel commented 2024-01-22 12:40:38 +01:00
Review
Copy Link

Don't check GS(id->name) == ID_OB. If that fails the rest of the code here crashes anyway.

Don't check `GS(id->name) == ID_OB`. If that fails the rest of the code here crashes anyway.
Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob);
ParticleSystem *psys = static_cast<ParticleSystem *>(pid->calldata);
ParticleSystem *psys_eval = psys_eval_get(depsgraph, ob, psys);
BKE_ptcache_id_from_particles(&pid_eval, ob_eval, psys_eval);
BKE_ptcache_write(&pid_eval, 0);
}
else {
BKE_ptcache_write(pid, 0);
}
}
}
}
@ -3385,7 +3401,20 @@ void BKE_ptcache_bake(PTCacheBaker *baker)
if (bake) {
cache->flag |= PTCACHE_BAKED;
if (cache->flag & PTCACHE_DISK_CACHE) {
BKE_ptcache_write(pid, 0);
if (pid->type == PTCACHE_TYPE_PARTICLES) {
/* Since writing this from outside the bake job, make sure the ParticleSystem and
* PTCacheID is in a fully evaluated state. */
ID *id = pid->owner_id;
Object *ob = (GS(id->name) == ID_OB) ? reinterpret_cast<Object *>(id) : nullptr;
Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob);
ParticleSystem *psys = static_cast<ParticleSystem *>(pid->calldata);
ParticleSystem *psys_eval = psys_eval_get(depsgraph, ob, psys);
BKE_ptcache_id_from_particles(&pid_eval, ob_eval, psys_eval);
BKE_ptcache_write(&pid_eval, 0);
}
else {
BKE_ptcache_write(pid, 0);
}
}
}
}