diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 137afcc4..a4f5f6fb 100644 --- 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 diff --git a/test/core/core_force_unrestricted_gentype.cpp b/test/core/core_force_unrestricted_gentype.cpp index 46a8b1ed..f198fa33 100644 --- 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