mewin/glm
1
0
Fork 0
Code Releases Activity

Removed GLM_FORCE_SWIZZLE and GLM_FORCE_UNRESTRICTED_GENTYPE restriction

Browse Source
This commit is contained in:
Christophe Riccio
2018-07-23 18:53:10 +02:00
parent 4e574af7ac
commit 96bf3c0d95
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
glm/detail/setup.hpp
View File

@@ -35,13 +35,6 @@
#include "../simd/platform.h" #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 // Build model

1
test/core/core_force_unrestricted_gentype.cpp
View File

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