summaryrefslogtreecommitdiff
path: root/thirdparty
diff options
context:
space:
mode:
Diffstat (limited to 'thirdparty')
-rw-r--r--thirdparty/README.md2
-rw-r--r--thirdparty/vhacd/src/FloatMath.inl4
2 files changed, 5 insertions, 1 deletions
diff --git a/thirdparty/README.md b/thirdparty/README.md
index db540f3728..27cfe41238 100644
--- a/thirdparty/README.md
+++ b/thirdparty/README.md
@@ -483,7 +483,7 @@ Files extracted from upstream source:
## vhacd
- Upstream: https://github.com/kmammou/v-hacd
-- Version: git (2297aa1, 2018)
+- Version: git (b07958e, 2019)
- License: BSD-3-Clause
Files extracted from upstream source:
diff --git a/thirdparty/vhacd/src/FloatMath.inl b/thirdparty/vhacd/src/FloatMath.inl
index ce529e6f71..a30deba45d 100644
--- a/thirdparty/vhacd/src/FloatMath.inl
+++ b/thirdparty/vhacd/src/FloatMath.inl
@@ -7,6 +7,10 @@
// a quaternion is a 'float *' to 4 floats representing a quaternion x,y,z,w
//
+#ifdef _MSC_VER
+#pragma warning(disable:4996)
+#endif
+
namespace FLOAT_MATH
{