forked from bartvdbraak/blender
Merge branch 'blender-v2.83-release'
This commit is contained in:
commit
aa0e98d707
2
extern/mantaflow/preprocessed/gitinfo.h
vendored
2
extern/mantaflow/preprocessed/gitinfo.h
vendored
@ -1,3 +1,3 @@
|
||||
|
||||
|
||||
#define MANTA_GIT_VERSION "commit 534495ae4528094e382e4daadbacaa32d5878de1"
|
||||
#define MANTA_GIT_VERSION "commit b61bf9efa7a1d8ca98635076a7e9f2c4dacb2914"
|
||||
|
8
extern/mantaflow/preprocessed/particle.h
vendored
8
extern/mantaflow/preprocessed/particle.h
vendored
@ -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...
|
||||
|
Loading…
Reference in New Issue
Block a user