Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiika Hamalainen <blender@miikah.org>2013-04-05 11:56:59 +0400
committerMiika Hamalainen <blender@miikah.org>2013-04-05 11:56:59 +0400
commita00b72bc7503fd1aecdae41a7cb9338f2eb9b35b (patch)
treef0aa8a03bcfc4056391d22cd5e857ac09a5edbf8
parentaabc999c17940fde1bcc0b02edf234bf58bf6b3c (diff)
Fix [#34857]: Negative temp.diff. in a smoke simulation doesn't work.
-rw-r--r--source/blender/blenkernel/intern/smoke.c2
1 files changed, 1 insertions, 1 deletions
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) {