diff options
author | Sebastián Barschkis <sebbas@sebbas.org> | 2021-02-02 19:46:48 +0300 |
---|---|---|
committer | Sebastián Barschkis <sebbas@sebbas.org> | 2021-02-02 19:46:48 +0300 |
commit | 9ad828dbad94d279521875db47a3472a38cc9b29 (patch) | |
tree | 7f7ef01c32299b3259ca7d0737ea9fe558b8bc82 /extern/mantaflow/preprocessed/grid4d.cpp | |
parent | f8359b5f52d65a3d59ca9d24db67805d2a0ce316 (diff) |
Fluid: Updated Mantaflow source files
Includes improvements for the file IO. Namely, more meta data will be written from now on.
This change is required to prevent IO issues (e.g. T84649) that arised through the use of sparse grids caching (introduced in 2.92).
Diffstat (limited to 'extern/mantaflow/preprocessed/grid4d.cpp')
-rw-r--r-- | extern/mantaflow/preprocessed/grid4d.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/extern/mantaflow/preprocessed/grid4d.cpp b/extern/mantaflow/preprocessed/grid4d.cpp index 1a79a835854..72bd3a6fe50 100644 --- a/extern/mantaflow/preprocessed/grid4d.cpp +++ b/extern/mantaflow/preprocessed/grid4d.cpp @@ -491,9 +491,7 @@ template<class T> Grid4d<T> &Grid4d<T>::safeDivide(const Grid4d<T> &a) } template<class T> Grid4d<T> &Grid4d<T>::copyFrom(const Grid4d<T> &a, bool copyType) { - assertMsg(a.mSize.x == mSize.x && a.mSize.y == mSize.y && a.mSize.z == mSize.z && - a.mSize.t == mSize.t, - "different Grid4d resolutions " << a.mSize << " vs " << this->mSize); + assertMsg(a.mSize == mSize, "different Grid4d resolutions " << a.mSize << " vs " << this->mSize); memcpy(mData, a.mData, sizeof(T) * mSize.x * mSize.y * mSize.z * mSize.t); if (copyType) mType = a.mType; // copy type marker |