From 96bf3c0d956aaa55489c6c20eacc325d9b1209b7 Mon Sep 17 00:00:00 2001
From: Christophe Riccio <christophe.riccio@unity3d.com>
Date: Mon, 23 Jul 2018 18:53:10 +0200
Subject: [PATCH] Removed GLM_FORCE_SWIZZLE and GLM_FORCE_UNRESTRICTED_GENTYPE
 restriction

---
 glm/detail/setup.hpp                          | 7 -------
 test/core/core_force_unrestricted_gentype.cpp | 1 +
 2 files changed, 1 insertion(+), 7 deletions(-)

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 <glm/glm.hpp>