[Bf-blender-cvs] [35a29befb36] master: Fluid: Updated Manta pp files

[Sebastián Barschkis]

Commit: 35a29befb3678a684a144e9974c371fa926cb535
Author: Sebastián Barschkis
Date:   Mon Mar 16 11:52:07 2020 +0100
Branches: master
https://developer.blender.org/rB35a29befb3678a684a144e9974c371fa926cb535

Fluid: Updated Manta pp files

Includes additional minmax check for Windows

===================================================================

M	extern/mantaflow/helper/util/vectorbase.h
M	extern/mantaflow/preprocessed/gitinfo.h

===================================================================

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"