Removed GLM_FORCE_SWIZZLE and GLM_FORCE_UNRESTRICTED_GENTYPE restriction

ago%!(EXTRA string=7 years) · 96bf3c0d95
parent 4e574af7ac
commit 96bf3c0d95
2 changed files with 1 additions and 7 deletions
--- a/glm/detail/setup.hpp
+++ b/glm/detail/setup.hpp
@ -35,13 +35,6 @@

 #include "../simd/platform.h"

-///////////////////////////////////////////////////////////////////////////////////
-// Incompatible GLM_FORCE defines
-
-#if defined(GLM_FORCE_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
-
 ///////////////////////////////////////////////////////////////////////////////////
 // Build model

--- a/test/core/core_force_unrestricted_gentype.cpp
+++ b/test/core/core_force_unrestricted_gentype.cpp
@ -1,4 +1,5 @@
 #define GLM_FORCE_UNRESTRICTED_GENTYPE
+#define GLM_FORCE_SWIZZLE

 #include <glm/glm.hpp>