From 424d2fcfb4b943c891cf848011c91b6fd148c188 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Tue, 12 Nov 2019 09:24:09 +0100 Subject: [PATCH] vhacd: Sync with upstream b07958e Nothing to see here, it is just a cosmetic sync to confirm that we have the latest upstream changes. --- thirdparty/README.md | 2 +- thirdparty/vhacd/src/FloatMath.inl | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/thirdparty/README.md b/thirdparty/README.md index c99c2165f68..b4ef084cf8a 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -481,7 +481,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 ce529e6f710..a30deba45d7 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 {