diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-11-12 09:57:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-12 09:57:10 +0100 |
| commit | 7d836a7cc399fd388550d8e3af2e5b70e6e2daa7 (patch) | |
| tree | 4ee8737429ed3815894842898cb144d008b775d7 /thirdparty | |
| parent | 466e867d77aa34fc4cb44f374eeaf6716ee808f0 (diff) | |
| parent | 424d2fcfb4b943c891cf848011c91b6fd148c188 (diff) | |
Merge pull request #33565 from akien-mga/vhacd-b07958e
vhacd: Sync with upstream b07958e
Diffstat (limited to 'thirdparty')
| -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 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 { |