[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31106] trunk/blender/source/blender/ render/intern/source/convertblender.c: Fix #23204: render disconnected hair with child particles could crash.

Brecht Van Lommel brecht at blender.org
Fri Aug 6 17:31:35 CEST 2010


Revision: 31106
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31106
Author:   blendix
Date:     2010-08-06 17:31:35 +0200 (Fri, 06 Aug 2010)

Log Message:
-----------
Fix #23204: render disconnected hair with child particles could crash.

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/convertblender.c

Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c	2010-08-06 15:17:44 UTC (rev 31105)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c	2010-08-06 15:31:35 UTC (rev 31106)
@@ -1528,6 +1528,10 @@
 
 	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);
 	}





More information about the Bf-blender-cvs mailing list