From f4c66673472d399d714f9cdb9711b86da526566d Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Thu, 5 Mar 2020 23:46:36 +0100 Subject: [PATCH] Fixed unnecessary warnings from matrix_projection.inl #995 --- glm/ext/matrix_projection.inl | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/glm/ext/matrix_projection.inl b/glm/ext/matrix_projection.inl index 8b4eea98..2f2c196a 100644 --- a/glm/ext/matrix_projection.inl +++ b/glm/ext/matrix_projection.inl @@ -35,10 +35,11 @@ namespace glm template GLM_FUNC_QUALIFIER vec<3, T, Q> project(vec<3, T, Q> const& obj, mat<4, 4, T, Q> const& model, mat<4, 4, T, Q> const& proj, vec<4, U, Q> const& viewport) { - if(GLM_CONFIG_CLIP_CONTROL & GLM_CLIP_CONTROL_ZO_BIT) +# if GLM_CONFIG_CLIP_CONTROL & GLM_CLIP_CONTROL_ZO_BIT return projectZO(obj, model, proj, viewport); - else +# else return projectNO(obj, model, proj, viewport); +# endif } template @@ -77,10 +78,11 @@ namespace glm template GLM_FUNC_QUALIFIER vec<3, T, Q> unProject(vec<3, T, Q> const& win, mat<4, 4, T, Q> const& model, mat<4, 4, T, Q> const& proj, vec<4, U, Q> const& viewport) { - if(GLM_CONFIG_CLIP_CONTROL & GLM_CLIP_CONTROL_ZO_BIT) +# if GLM_CONFIG_CLIP_CONTROL & GLM_CLIP_CONTROL_ZO_BIT return unProjectZO(win, model, proj, viewport); - else +# else return unProjectNO(win, model, proj, viewport); +# endif } template