From 463c3b5cf7a5ccb6c3ef7f290503f9ead4cac514 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 6 Aug 2010 15:31:35 +0000 Subject: Fix #23204: render disconnected hair with child particles could crash. --- source/blender/render/intern/source/convertblender.c | 4 ++++ 1 file changed, 4 insertions(+) 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); } -- cgit v1.2.3