[Bf-blender-cvs] [84e1e0cf95d] master: Fix T78170: Mantaflow Crash | Whitewater Particles Baking

[Sebastián Barschkis]

Commit: 84e1e0cf95dace47e2a35a0ca3adb18be7ec4699
Author: Sebastián Barschkis
Date:   Fri Jun 26 18:29:14 2020 +0200
Branches: master
https://developer.blender.org/rB84e1e0cf95dace47e2a35a0ca3adb18be7ec4699

Fix T78170: Mantaflow Crash | Whitewater Particles Baking

Fixed issue in the upstream Mantaflow repository.

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

M	extern/mantaflow/preprocessed/gitinfo.h
M	extern/mantaflow/preprocessed/plugin/secondaryparticles.cpp

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

diff --git a/extern/mantaflow/preprocessed/gitinfo.h b/extern/mantaflow/preprocessed/gitinfo.h
index e4183ec342b..73ff70b10a0 100644
--- a/extern/mantaflow/preprocessed/gitinfo.h
+++ b/extern/mantaflow/preprocessed/gitinfo.h
@@ -1,3 +1,3 @@
 
 
-#define MANTA_GIT_VERSION "commit 5ae24e860cf15f1310666e119575cc01bea48598"
+#define MANTA_GIT_VERSION "commit d80d3c821de74315ab26b5efd153d41477b976c4"
diff --git a/extern/mantaflow/preprocessed/plugin/secondaryparticles.cpp b/extern/mantaflow/preprocessed/plugin/secondaryparticles.cpp
index 5e24b6f28db..5aae7285f1a 100644
--- a/extern/mantaflow/preprocessed/plugin/secondaryparticles.cpp
+++ b/extern/mantaflow/preprocessed/plugin/secondaryparticles.cpp
@@ -118,7 +118,9 @@ struct knFlipComputeSecondaryParticlePotentials : public KernelBase {
     for (IndexInt x = i - radius; x <= i + radius; x++) {
       for (IndexInt y = j - radius; y <= j + radius; y++) {
         for (IndexInt z = k - radius; z <= k + radius; z++) {
-          if ((x == i && y == j && z == k) || !flags.isInBounds(Vec3i(x, y, z)) ||
+          // ensure that xyz is in bounds: use bnd=1 to ensure that vel.getCentered() always has a
+          // neighbor cell
+          if ((x == i && y == j && z == k) || !flags.isInBounds(Vec3i(x, y, z), 1) ||
               (flags(x, y, z) & jtype))
             continue;