diff options
| author | Julian Eisel <julian@blender.org> | 2020-07-01 18:13:57 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-07-01 18:13:57 +0300 |
| commit | 0829cebeb024095c268f190c34daa8ae9a5a224c (patch) | |
| tree | 12ee5a4a1c2a32e12eff47c8eb9bb0ed217791c1 /extern/mantaflow/preprocessed/plugin/secondaryparticles.cpp | |
| parent | cfde6ebf450594faa57c4bfeaecff10fe512c91b (diff) | |
| parent | 42be3964eb201180f6b0fa1ff6ce43b8c3845bc2 (diff) | |
Merge branch 'master' into asset-uuid--archivedasset-uuid--archived
Diffstat (limited to 'extern/mantaflow/preprocessed/plugin/secondaryparticles.cpp')
| -rw-r--r-- | extern/mantaflow/preprocessed/plugin/secondaryparticles.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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; |