[Bf-blender-cvs] [76489fbe7c1] blender-v2.82-release: Fix T73483: Mantaflow: Smoke inflow in liquid domain emits liquid

[Sebastián Barschkis]

Commit: 76489fbe7c127504940cd6d7185e43f50629f1fa
Author: Sebastián Barschkis
Date:   Wed Jan 29 19:15:22 2020 +0100
Branches: blender-v2.82-release
https://developer.blender.org/rB76489fbe7c127504940cd6d7185e43f50629f1fa

Fix T73483: Mantaflow: Smoke inflow in liquid domain emits liquid

Added an extra check in the flow object loop that compares flow object type and domain type prior to writing to flow maps.

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

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

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

diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c
index 18eac2789a2..cb94a78e619 100644
--- a/source/blender/blenkernel/intern/fluid.c
+++ b/source/blender/blenkernel/intern/fluid.c
@@ -2453,6 +2453,15 @@ static void update_flowsfluids(struct Depsgraph *depsgraph,
       if (mfs->behavior == FLUID_FLOW_BEHAVIOR_GEOMETRY && !is_first_frame) {
         continue;
       }
+      /* Optimization: Skip flow object if it does not "belong" to this domain type. */
+      if (mfs->type == FLUID_FLOW_TYPE_LIQUID && mds->type == FLUID_DOMAIN_TYPE_GAS) {
+        continue;
+      }
+      if ((mfs->type == FLUID_FLOW_TYPE_SMOKE || mfs->type == FLUID_FLOW_TYPE_FIRE ||
+           mfs->type == FLUID_FLOW_TYPE_SMOKEFIRE) &&
+          mds->type == FLUID_DOMAIN_TYPE_LIQUID) {
+        continue;
+      }
 
       /* Length of one adaptive frame. If using adaptive stepping, length is smaller than actual
        * frame length */