[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55801] trunk/blender/source/blender/ blenkernel/intern/smoke.c: Fix [#34857]: Negative temp.diff.

Miika Hamalainen miika.hamalainen at kolumbus.fi
Fri Apr 5 09:57:00 CEST 2013


Revision: 55801
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55801
Author:   miikah
Date:     2013-04-05 07:56:59 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
Fix [#34857]: Negative temp.diff. in a smoke simulation doesn't work.

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-04-05 06:50:59 UTC (rev 55800)
+++ trunk/blender/source/blender/blenkernel/intern/smoke.c	2013-04-05 07:56:59 UTC (rev 55801)
@@ -1585,7 +1585,7 @@
 	float fuel_flow = emission_value * sfs->fuel_amount;
 	/* add heat */
 	if (heat) {
-		heat[index] = MAX2(emission_value * sfs->temp, heat[index]);
+		heat[index] = ADD_IF_LOWER(heat[index], emission_value * sfs->temp);
 	}
 	/* absolute */
 	if (absolute_flow) {




More information about the Bf-blender-cvs mailing list