diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-02-04 14:20:58 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-02-04 14:20:58 +0300 |
| commit | 5c8f8a74030c96e07a0ce719f37ed7958b6c3fb8 (patch) | |
| tree | 6ef48627addb8acf00f2cff7cde50592dd730d98 /source/blender/blenkernel/intern | |
| parent | 04ec64b251f155581b6bd2a6bc0d55c4381ba12d (diff) | |
| parent | 3dde6360ff6ae002002472f7b5a155e3d119230f (diff) | |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'source/blender/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/fluid.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c index 91adbf2301d..f35aebbae16 100644 --- a/source/blender/blenkernel/intern/fluid.c +++ b/source/blender/blenkernel/intern/fluid.c @@ -2432,6 +2432,11 @@ static void update_flowsfluids(struct Depsgraph *depsgraph, int subframes = mfs->subframes; EmissionMap *em = &emaps[flow_index]; + /* Optimization: Skip flow objects with disabled inflow flag. */ + if (mfs->behavior == FLUID_FLOW_BEHAVIOR_INFLOW && + (mfs->flags & FLUID_FLOW_USE_INFLOW) == 0) { + continue; + } /* Optimization: No need to compute emission value if it won't be applied. */ if (mfs->behavior == FLUID_FLOW_BEHAVIOR_GEOMETRY && !is_first_frame) { continue; |