diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-08-06 19:31:35 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-08-06 19:31:35 +0400 |
| commit | 463c3b5cf7a5ccb6c3ef7f290503f9ead4cac514 (patch) | |
| tree | 84fd13740bbf4779bc8d26737e43a3571d6cb913 | |
| parent | acca04bf33a5082cad0cee137d4a7a1fec81350d (diff) | |
Fix #23204: render disconnected hair with child particles could crash.
| -rw-r--r-- | source/blender/render/intern/source/convertblender.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index e17e3a3c600..26783d21da7 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -1528,6 +1528,10 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem totchild=psys->totchild; + /* can happen for disconnected/global hair */ + if(part->type==PART_HAIR && !psys->childcache) + totchild= 0; + if(G.rendering == 0) { /* preview render */ totchild = (int)((float)totchild * (float)part->disp / 100.0f); } |