diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-11-12 09:24:09 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2019-11-12 09:24:09 +0100 |
| commit | 424d2fcfb4b943c891cf848011c91b6fd148c188 (patch) | |
| tree | 87933969b3f204fd062279b63b9e101d41eba40d | |
| parent | 1d0bd3eb71c8c7905f12dd9c5490f2560d07db78 (diff) | |
vhacd: Sync with upstream b07958e
Nothing to see here, it is just a cosmetic sync to confirm
that we have the latest upstream changes.
| -rw-r--r-- | thirdparty/README.md | 2 | ||||
| -rw-r--r-- | thirdparty/vhacd/src/FloatMath.inl | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/thirdparty/README.md b/thirdparty/README.md index c99c2165f6..b4ef084cf8 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 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 { |