diff options
| author | Sebastián Barschkis <sebbas@sebbas.org> | 2020-03-16 13:52:07 +0300 |
|---|---|---|
| committer | Sebastián Barschkis <sebbas@sebbas.org> | 2020-03-16 13:52:18 +0300 |
| commit | 35a29befb3678a684a144e9974c371fa926cb535 (patch) | |
| tree | 1af4dc3d224c0fa17ec98e9cdb334c5839d87b4f /extern | |
| parent | 7df435325b5a4b8b34d61db42094554279e6bd62 (diff) | |
Fluid: Updated Manta pp files
Includes additional minmax check for Windows
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/mantaflow/helper/util/vectorbase.h | 2 | ||||
| -rw-r--r-- | extern/mantaflow/preprocessed/gitinfo.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/extern/mantaflow/helper/util/vectorbase.h b/extern/mantaflow/helper/util/vectorbase.h index a3135431eb3..41584663a0f 100644 --- a/extern/mantaflow/helper/util/vectorbase.h +++ b/extern/mantaflow/helper/util/vectorbase.h @@ -15,7 +15,7 @@ #define _VECTORBASE_H // get rid of windos min/max defines -#if defined(WIN32) || defined(_WIN32) +#if (defined(WIN32) || defined(_WIN32)) && !defined(NOMINMAX) # define NOMINMAX #endif diff --git a/extern/mantaflow/preprocessed/gitinfo.h b/extern/mantaflow/preprocessed/gitinfo.h index 48bb85c8479..574b655d6ce 100644 --- a/extern/mantaflow/preprocessed/gitinfo.h +++ b/extern/mantaflow/preprocessed/gitinfo.h @@ -1,3 +1,3 @@ -#define MANTA_GIT_VERSION "commit 1d55979473c25318f39c4a6bf48a5ab77b3bf39b" +#define MANTA_GIT_VERSION "commit caae2ddea6ea895677aca88df00a130a67eeb6c7" |