Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 20:56:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #13112 from sethalves/fix-overlay-asan-warning

Browse source 
Fix overlay asan warning
This commit is contained in:
John Conklin II 2018-05-15 14:51:05 -07:00 committed by GitHub
commit 1313d28b9d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/ui/overlays/Overlays.h
View file

@ -60,7 +60,7 @@ public:
bool intersects { false }; bool intersects { false };
OverlayID overlayID { UNKNOWN_OVERLAY_ID }; OverlayID overlayID { UNKNOWN_OVERLAY_ID };
float distance { 0 }; float distance { 0 };
BoxFace face; BoxFace face { UNKNOWN_FACE };
glm::vec3 surfaceNormal; glm::vec3 surfaceNormal;
glm::vec3 intersection; glm::vec3 intersection;
QVariantMap extraInfo; QVariantMap extraInfo;

4
tests-manual/render-texture-load/src/GLIHelpers.h
View file

@ -15,7 +15,7 @@
// Work around for a bug in the MSVC compiler that chokes when you use GLI and Qt headers together. // Work around for a bug in the MSVC compiler that chokes when you use GLI and Qt headers together.
#define gli glm #define gli glm
#ifdef Q_OS_MAC #if defined(__clang__)
#pragma clang diagnostic push #pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunused-variable" #pragma clang diagnostic ignored "-Wunused-variable"
#pragma clang diagnostic ignored "-Wignored-qualifiers" #pragma clang diagnostic ignored "-Wignored-qualifiers"
@ -33,7 +33,7 @@
#include <gli/gli.hpp> #include <gli/gli.hpp>
#ifdef Q_OS_MAC #if defined(__clang__)
#pragma clang diagnostic pop #pragma clang diagnostic pop
#endif #endif