[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60316] trunk/blender/source/blender/ blenkernel/intern/smoke.c: Fix [#36791]: Fire ignores force fields when smoke is set to 0.0

[Miika Hamalainen]

Revision: 60316
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60316
Author:   miikah
Date:     2013-09-22 16:09:31 +0000 (Sun, 22 Sep 2013)
Log Message:
-----------
Fix [#36791]: Fire ignores force fields when smoke is set to 0.0

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-22 15:34:41 UTC (rev 60315)
+++ trunk/blender/source/blender/blenkernel/intern/smoke.c	2013-09-22 16:09:31 UTC (rev 60316)
@@ -2386,6 +2386,7 @@
 	if (effectors)
 	{
 		float *density = smoke_get_density(sds->fluid);
+		float *fuel = smoke_get_fuel(sds->fluid);
 		float *force_x = smoke_get_force_x(sds->fluid);
 		float *force_y = smoke_get_force_y(sds->fluid);
 		float *force_z = smoke_get_force_z(sds->fluid);
@@ -2408,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 ((density[index] < FLT_EPSILON) || obstacle[index])
+					if ((MAX2(density[index], fuel[index]) < FLT_EPSILON) || obstacle[index])
 						continue;
 
 					vel[0] = velocity_x[index];