From e77c300e4c61de435528f5f58c1928c62032bafe Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Fri, 2 Sep 2016 01:41:20 +0200 Subject: [PATCH] Fixed error to cover deprecated define --- glm/detail/setup.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 6ca11a62..cf6167f4 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -3,7 +3,7 @@ #pragma once -#if defined(GLM_FORCE_SWIZZLE) && defined(GLM_FORCE_UNRESTRICTED_GENTYPE) +#if (defined(GLM_FORCE_SWIZZLE) || defined(GLM_SWIZZLE)) && defined(GLM_FORCE_UNRESTRICTED_GENTYPE) # error "Both GLM_FORCE_SWIZZLE and GLM_FORCE_UNRESTRICTED_GENTYPE can't be defined at the same time" #endif