[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59102] trunk/blender/source/blender/ render/intern/source/convertblender.c: Fix #36451, Particle system crashes blender.

[Lukas Toenne]

Revision: 59102
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59102
Author:   lukastoenne
Date:     2013-08-13 06:21:39 +0000 (Tue, 13 Aug 2013)
Log Message:
-----------
Fix #36451, Particle system crashes blender. The psys_render_restore function was accessing the psys->frand random number array, but since the particle modifier is disabled this array does not get
initialized. Added a sanity check to skip disabled particle systems in BI render. (why wasn't this done before?)

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	2013-08-13 06:08:54 UTC (rev 59101)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c	2013-08-13 06:21:39 UTC (rev 59102)
@@ -4817,6 +4817,9 @@
 	if (ob->particlesystem.first) {
 		psysindex= 1;
 		for (psys=ob->particlesystem.first; psys; psys=psys->next, psysindex++) {
+			if (!psys_check_enabled(ob, psys))
+				continue;
+			
 			obr= RE_addRenderObject(re, ob, par, index, psysindex, ob->lay);
 			if ((dob && !dob->animated) || (ob->transflag & OB_RENDER_DUPLI)) {
 				obr->flag |= R_INSTANCEABLE;