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 /scene/resources/camera_attributes.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 'scene/resources/camera_attributes.cpp')
-rw-r--r-- | scene/resources/camera_attributes.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/scene/resources/camera_attributes.cpp b/scene/resources/camera_attributes.cpp index 7c46729af3..323241200c 100644 --- a/scene/resources/camera_attributes.cpp +++ b/scene/resources/camera_attributes.cpp @@ -373,6 +373,11 @@ real_t CameraAttributesPhysical::get_fov() const { return frustum_fov; } +#ifdef MINGW_ENABLED +#undef near +#undef far +#endif + void CameraAttributesPhysical::_update_frustum() { //https://en.wikipedia.org/wiki/Circle_of_confusion#Circle_of_confusion_diameter_limit_based_on_d/1500 Vector2i sensor_size = Vector2i(36, 24); // Matches high-end DSLR, could be made variable if there is demand. |