diff options
| author | Sebastián Barschkis <sebbas@sebbas.org> | 2020-05-20 17:37:29 +0300 |
|---|---|---|
| committer | Sebastián Barschkis <sebbas@sebbas.org> | 2020-05-20 17:37:29 +0300 |
| commit | c1545c9a9d18cc7088ffff01b4b40efeab3efc8d (patch) | |
| tree | 8d043a22d5421b17efd76854068474c1868f9cf4 /extern | |
| parent | 9897ef6a20dbbcf834ea949013daebfdd0b4e6de (diff) | |
Fluid: Fix for non-moving liquid particles
Issue was introduced in 7bb3d9787ead with new Mantaflow files from 61280e5af3da.
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/mantaflow/preprocessed/gitinfo.h | 2 | ||||
| -rw-r--r-- | extern/mantaflow/preprocessed/particle.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/extern/mantaflow/preprocessed/gitinfo.h b/extern/mantaflow/preprocessed/gitinfo.h index 786f6aad4b1..023974fd6cd 100644 --- a/extern/mantaflow/preprocessed/gitinfo.h +++ b/extern/mantaflow/preprocessed/gitinfo.h @@ -1,3 +1,3 @@ -#define MANTA_GIT_VERSION "commit 534495ae4528094e382e4daadbacaa32d5878de1" +#define MANTA_GIT_VERSION "commit b61bf9efa7a1d8ca98635076a7e9f2c4dacb2914" diff --git a/extern/mantaflow/preprocessed/particle.h b/extern/mantaflow/preprocessed/particle.h index 74c565593fd..d9dd3f49c38 100644 --- a/extern/mantaflow/preprocessed/particle.h +++ b/extern/mantaflow/preprocessed/particle.h @@ -2468,15 +2468,15 @@ template<class S> void ParticleSystem<S>::compress() //! insert buffered positions as new particles, update additional particle data template<class S> void ParticleSystem<S>::insertBufferedParticles() { + // clear new flag everywhere + for (IndexInt i = 0; i < (IndexInt)mData.size(); ++i) + mData[i].flag &= ~PNEW; + if (mNewBufferPos.size() == 0) return; IndexInt newCnt = mData.size(); resizeAll(newCnt + mNewBufferPos.size()); - // clear new flag everywhere - for (IndexInt i = 0; i < (IndexInt)mData.size(); ++i) - mData[i].flag &= ~PNEW; - for (IndexInt i = 0; i < (IndexInt)mNewBufferPos.size(); ++i) { int flag = (mNewBufferFlag.size() > 0) ? mNewBufferFlag[i] : 0; // note, other fields are not initialized here... |