From a00b72bc7503fd1aecdae41a7cb9338f2eb9b35b Mon Sep 17 00:00:00 2001 From: Miika Hamalainen Date: Fri, 5 Apr 2013 07:56:59 +0000 Subject: Fix [#34857]: Negative temp.diff. in a smoke simulation doesn't work. --- source/blender/blenkernel/intern/smoke.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index 0863517c7d7..6b8f0348e16 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -1585,7 +1585,7 @@ BLI_INLINE void apply_inflow_fields(SmokeFlowSettings *sfs, float emission_value 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) { -- cgit v1.2.3