[Bf-blender-cvs] [e6a5e5077bf] master: Fluid: Fix placement of flag reset

[Sebastián Barschkis]

Commit: e6a5e5077bfcca8f56fd7feb914af3c8db72bb50
Author: Sebastián Barschkis
Date:   Wed Dec 18 00:00:48 2019 +0100
Branches: master
https://developer.blender.org/rBe6a5e5077bfcca8f56fd7feb914af3c8db72bb50

Fluid: Fix placement of flag reset

Flag reset needs to be placed outside the object loop

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

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

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

diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c
index e1eeb7f611d..be8c1401b53 100644
--- a/source/blender/blenkernel/intern/fluid.c
+++ b/source/blender/blenkernel/intern/fluid.c
@@ -3131,6 +3131,12 @@ static void update_flowsflags(FluidDomainSettings *mds, Object **flowobjs, int n
   int active_fields = mds->active_fields;
   uint flow_index;
 
+  /* First, remove all flags that we want to update. */
+  int prev_flags = (FLUID_DOMAIN_ACTIVE_INVEL | FLUID_DOMAIN_ACTIVE_OUTFLOW |
+                    FLUID_DOMAIN_ACTIVE_HEAT | FLUID_DOMAIN_ACTIVE_FIRE |
+                    FLUID_DOMAIN_ACTIVE_COLOR_SET | FLUID_DOMAIN_ACTIVE_COLORS);
+  active_fields &= ~prev_flags;
+
   /* Monitor active fields based on flow settings */
   for (flow_index = 0; flow_index < numflowobj; flow_index++) {
     Object *coll_ob = flowobjs[flow_index];
@@ -3142,12 +3148,6 @@ static void update_flowsflags(FluidDomainSettings *mds, Object **flowobjs, int n
       continue;
     }
 
-    /* First, remove all flags that we want to update. */
-    int prev_flags = (FLUID_DOMAIN_ACTIVE_INVEL | FLUID_DOMAIN_ACTIVE_OUTFLOW |
-                      FLUID_DOMAIN_ACTIVE_HEAT | FLUID_DOMAIN_ACTIVE_FIRE |
-                      FLUID_DOMAIN_ACTIVE_COLOR_SET | FLUID_DOMAIN_ACTIVE_COLORS);
-    active_fields &= ~prev_flags;
-
     if ((mmd2->type & MOD_FLUID_TYPE_FLOW) && mmd2->flow) {
       FluidFlowSettings *mfs = mmd2->flow;
       if (!mfs) {