Home Explore Help
Sign In
cpp
/
glm
mirror of https://github.com/g-truc/glm.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Removed GLM_FORCE_SWIZZLE and GLM_FORCE_UNRESTRICTED_GENTYPE restriction

Christophe Riccio 7 years ago
parent
4e574af7ac
commit
96bf3c0d95
2 changed files with 1 additions and 7 deletions
Split View Show Diff Stats
  1. 0 7
      glm/detail/setup.hpp
  2. 1 0
      test/core/core_force_unrestricted_gentype.cpp

+ 0 - 7
glm/detail/setup.hpp
View File 

@@ -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

+ 1 - 0
test/core/core_force_unrestricted_gentype.cpp
View File 

@@ -1,4 +1,5 @@
 
 #define GLM_FORCE_UNRESTRICTED_GENTYPE
 
+#define GLM_FORCE_SWIZZLE
 
 
 #include <glm/glm.hpp>