Fix OSX/Linux warnings

This commit is contained in:
David Rowe 2018-10-19 08:20:21 +13:00
parent e339f966d9
commit 9b4c5e1685

View file

@ -557,8 +557,8 @@ RayToOverlayIntersectionResult Overlays::findRayIntersectionVector(const PickRay
thisFace, thisSurfaceNormal, thisExtraInfo, precisionPicking)) { thisFace, thisSurfaceNormal, thisExtraInfo, precisionPicking)) {
bool isDrawInFront = thisOverlay->getDrawInFront(); bool isDrawInFront = thisOverlay->getDrawInFront();
bool isTablet = tabletIDs.contains(thisID); bool isTablet = tabletIDs.contains(thisID);
if (isDrawInFront && !bestIsFront && !bestIsTablet if ((isDrawInFront && !bestIsFront && !bestIsTablet)
|| (isTablet || isDrawInFront || !bestIsFront) && thisDistance < bestDistance) { || ((isTablet || isDrawInFront || !bestIsFront) && thisDistance < bestDistance)) {
bestIsFront = isDrawInFront; bestIsFront = isDrawInFront;
bestIsTablet = isTablet; bestIsTablet = isTablet;
bestDistance = thisDistance; bestDistance = thisDistance;