diff options
| author | Sebastián Barschkis <sebbas@sebbas.org> | 2020-01-30 13:27:29 +0300 |
|---|---|---|
| committer | Sebastián Barschkis <sebbas@sebbas.org> | 2020-01-30 13:27:54 +0300 |
| commit | 5a570be9f500d495535639cbd1363c1423084790 (patch) | |
| tree | e61b6fb0cdbe6a604307f199764741c1c96368dc /extern | |
| parent | 78872b33600ed68ca1aa5295b5c9df3cc79a1da2 (diff) | |
Fluid: Updated Manta pp files
Includes latest changes from the upstream manta repository.
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/mantaflow/preprocessed/conjugategrad.cpp | 2 | ||||
| -rw-r--r-- | extern/mantaflow/preprocessed/gitinfo.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/extern/mantaflow/preprocessed/conjugategrad.cpp b/extern/mantaflow/preprocessed/conjugategrad.cpp index ac317402a49..de522d0b8f4 100644 --- a/extern/mantaflow/preprocessed/conjugategrad.cpp +++ b/extern/mantaflow/preprocessed/conjugategrad.cpp @@ -650,7 +650,7 @@ void cgSolveDiffusion(const FlagGrid &flags, << ", res:" << gcg->getSigma(), CG_DEBUGLEVEL); } - else if ((grid.getType() & GridBase::TypeVec3) || (grid.getType() & GridBase::TypeVec3)) { + else if ((grid.getType() & GridBase::TypeVec3) || (grid.getType() & GridBase::TypeMAC)) { Grid<Vec3> &vec = ((Grid<Vec3> &)grid); Grid<Real> u(parent); diff --git a/extern/mantaflow/preprocessed/gitinfo.h b/extern/mantaflow/preprocessed/gitinfo.h index 216aaf4e2bc..6d3abd1e88e 100644 --- a/extern/mantaflow/preprocessed/gitinfo.h +++ b/extern/mantaflow/preprocessed/gitinfo.h @@ -1,3 +1,3 @@ -#define MANTA_GIT_VERSION "commit 8d19f1096a4d8e115d9d1ec6024c65d53a94f47b" +#define MANTA_GIT_VERSION "commit 3f5c7989fd82920f0c509844a06e97dd1069191c" |