[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60406] trunk/blender/source/blender/ blenkernel/intern/smoke.c: Fix [#36827] 2.69 bug with smoke domain, particle emitter and a force field causes a crash

[Bastien Montagne]

Revision: 60406
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60406
Author:   mont29
Date:     2013-09-28 05:06:02 +0000 (Sat, 28 Sep 2013)
Log Message:
-----------
Fix [#36827] 2.69 bug with smoke domain, particle emitter and a force field causes a crash

fuel array might be null!

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/smoke.c

Modified: trunk/blender/source/blender/blenkernel/intern/smoke.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/smoke.c	2013-09-28 03:45:01 UTC (rev 60405)
+++ trunk/blender/source/blender/blenkernel/intern/smoke.c	2013-09-28 05:06:02 UTC (rev 60406)
@@ -2409,7 +2409,7 @@
 					float voxelCenter[3] = {0, 0, 0}, vel[3] = {0, 0, 0}, retvel[3] = {0, 0, 0};
 					unsigned int index = smoke_get_index(x, sds->res[0], y, sds->res[1], z);
 
-					if ((MAX2(density[index], fuel[index]) < FLT_EPSILON) || obstacle[index])
+					if (((fuel ? MAX2(density[index], fuel[index]) : density[index]) < FLT_EPSILON) || obstacle[index])
 						continue;
 
 					vel[0] = velocity_x[index];