[Bf-blender-cvs] [8f1876b4f01] master: Fluid: Fix issue with fire emission

Sebastián Barschkis noreply at git.blender.org
Wed Mar 4 18:47:55 CET 2020


Commit: 8f1876b4f01a62063bd2fe019cab90872812136f
Author: Sebastián Barschkis
Date:   Wed Mar 4 17:46:42 2020 +0100
Branches: master
https://developer.blender.org/rB8f1876b4f01a62063bd2fe019cab90872812136f

Fluid: Fix issue with fire emission

Fixes weird behavior at inflow regions. Issue was introduced with d6d44ccc7786.

===================================================================

M	source/blender/blenkernel/intern/fluid.c

===================================================================

diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c
index 3df62a361f5..6fc732687d1 100644
--- a/source/blender/blenkernel/intern/fluid.c
+++ b/source/blender/blenkernel/intern/fluid.c
@@ -2276,7 +2276,7 @@ BLI_INLINE void apply_inflow_fields(FluidFlowSettings *mfs,
     /* Instead of using 1.0 for all new fuel add slight falloff to reduce flow blocky-ness. */
     float value = 1.0f - pow2f(1.0f - emission_value);
 
-    if (fuel_in[index] > FLT_EPSILON && value >= react[index]) {
+    if (fuel_in[index] > FLT_EPSILON && value > react[index]) {
       float f = fuel_flow / fuel_in[index];
       react_in[index] = value * f + (1.0f - f) * react[index];
       CLAMP(react_in[index], 0.0f, value);



More information about the Bf-blender-cvs mailing list