diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2023-11-21 15:44:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-21 15:44:18 +0100 |
| commit | c2f8fb301537a5d688d201178985963282b4f9c3 (patch) | |
| tree | 6e21f7954af3ef36854f53830519c6b6be8c689f /core/math/aabb.cpp | |
| parent | fa259a77cd9ea725f22ccfd52d5c228e10358e1d (diff) | |
| parent | fe4850c0d0e8eed3fe851007c667206684aab0fc (diff) | |
| download | redot-engine-c2f8fb301537a5d688d201178985963282b4f9c3.tar.gz | |
Merge pull request #85039 from RandomShaper/mingwthreads
Use mingw-std-threads in MinGW builds
Diffstat (limited to 'core/math/aabb.cpp')
| -rw-r--r-- | core/math/aabb.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/math/aabb.cpp b/core/math/aabb.cpp index 1071df0979..e1d49dacc0 100644 --- a/core/math/aabb.cpp +++ b/core/math/aabb.cpp @@ -117,6 +117,11 @@ AABB AABB::intersection(const AABB &p_aabb) const { return AABB(min, max - min); } +#ifdef MINGW_ENABLED +#undef near +#undef far +#endif + bool AABB::intersects_ray(const Vector3 &p_from, const Vector3 &p_dir, Vector3 *r_clip, Vector3 *r_normal) const { #ifdef MATH_CHECKS if (unlikely(size.x < 0 || size.y < 0 || size.z < 0)) { |