From d2ebd5248edd4cbd124824b6552e03ed76e17d7b Mon Sep 17 00:00:00 2001 From: Arthur Danskin Date: Mon, 29 Jun 2020 19:59:41 -0400 Subject: [PATCH] make GLM_FORCE_XYZW_ONLY work with GLM_SWIZZLE_FUNCTION --- glm/detail/setup.hpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index c9c89a57..cd35b547 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -447,16 +447,12 @@ #define GLM_SWIZZLE_OPERATOR 1 #define GLM_SWIZZLE_FUNCTION 2 -//#if defined(GLM_FORCE_XYZW_ONLY) -//# undef GLM_FORCE_SWIZZLE -//#endif - #if defined(GLM_SWIZZLE) # pragma message("GLM: GLM_SWIZZLE is deprecated, use GLM_FORCE_SWIZZLE instead.") # define GLM_FORCE_SWIZZLE #endif -#if defined(GLM_FORCE_SWIZZLE) && (GLM_LANG & GLM_LANG_CXXMS_FLAG) +#if defined(GLM_FORCE_SWIZZLE) && (GLM_LANG & GLM_LANG_CXXMS_FLAG) && !defined(GLM_FORCE_XYZW_ONLY) # define GLM_CONFIG_SWIZZLE GLM_SWIZZLE_OPERATOR #elif defined(GLM_FORCE_SWIZZLE) # define GLM_CONFIG_SWIZZLE GLM_SWIZZLE_FUNCTION