archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

bugfix [#25519] particlesystem, type hair, hair dynamics enabled: crash with amount 0

Browse Source
This commit is contained in:
Campbell Barton
2011-01-07 04:30:02 +00:00
parent adf961a46c
commit 109d3b8454
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3297,8 +3297,8 @@ static void hair_step(ParticleSimulationData *sim, float cfra)
cloth_free_modifier(psys->clmd);
}
/* dynamics with cloth simulation */
if(psys->part->type==PART_HAIR && psys->flag & PSYS_HAIR_DYNAMICS)
/* dynamics with cloth simulation, psys->particles can be NULL with 0 particles [#25519] */
if(psys->part->type==PART_HAIR && psys->flag & PSYS_HAIR_DYNAMICS && psys->particles)
do_hair_dynamics(sim);
/* following lines were removed r29079 but cause bug [#22811], see report for details */