blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Fix T47773: Particle System with Boids Crash. 

Problem was, during initialization of boids particles in `dynamics_step()`,
psys of target objects was not obtained with generic `psys_get_target_system()`
as later in code, which could lead to some uninitialized `psys->tree` usage...

Think it's safe enough for 2.77, though not a regression.
This commit is contained in:
Bastien Montagne 2016-03-13 18:21:30 +01:00
parent ed28134f71
commit 34fe03c7f2
Notes: blender-bot 2023-02-14 08:06:36 +01:00 
Referenced by issue #47783, Grease pencil sculpt stroke size not displayed in the viewport.
Referenced by issue #47773, Particle System Crash
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/intern/boids.c
View File

@ -310,6 +310,7 @@ static int rule_avoid_collision(BoidRule *rule, BoidBrainData *bbd, BoidValues *
ParticleSystem *epsys = psys_get_target_system(bbd->sim->ob, pt);
if (epsys) {
BLI_assert(epsys->tree != NULL);
neighbors = BLI_kdtree_range_search__normal(
epsys->tree, pa->prev_state.co, pa->prev_state.ave,
&ptn, acbr->look_ahead * len_v3(pa->prev_state.vel));

6
source/blender/blenkernel/intern/particle_system.c
View File

@ -3510,8 +3510,10 @@ static void dynamics_step(ParticleSimulationData *sim, float cfra)
boids_precalc_rules(part, cfra);
for (; pt; pt=pt->next) {
if (pt->ob)
psys_update_particle_tree(BLI_findlink(&pt->ob->particlesystem, pt->psys-1), cfra);
ParticleSystem *psys_target = psys_get_target_system(sim->ob, pt);
if (psys_target && psys_target != psys) {
psys_update_particle_tree(psys_target, cfra);
}
}
break;
}