mirror of
https://github.com/g-truc/glm.git
synced 2024-11-10 04:31:47 +00:00
make GLM_FORCE_XYZW_ONLY work with GLM_SWIZZLE_FUNCTION
This commit is contained in:
parent
3b3db0fc5a
commit
d2ebd5248e
@ -447,16 +447,12 @@
|
||||
#define GLM_SWIZZLE_OPERATOR 1
|
||||
#define GLM_SWIZZLE_FUNCTION 2
|
||||
|
||||
//#if defined(GLM_FORCE_XYZW_ONLY)
|
||||
//# undef GLM_FORCE_SWIZZLE
|
||||
//#endif
|
||||
|
||||
#if defined(GLM_SWIZZLE)
|
||||
# pragma message("GLM: GLM_SWIZZLE is deprecated, use GLM_FORCE_SWIZZLE instead.")
|
||||
# define GLM_FORCE_SWIZZLE
|
||||
#endif
|
||||
|
||||
#if defined(GLM_FORCE_SWIZZLE) && (GLM_LANG & GLM_LANG_CXXMS_FLAG)
|
||||
#if defined(GLM_FORCE_SWIZZLE) && (GLM_LANG & GLM_LANG_CXXMS_FLAG) && !defined(GLM_FORCE_XYZW_ONLY)
|
||||
# define GLM_CONFIG_SWIZZLE GLM_SWIZZLE_OPERATOR
|
||||
#elif defined(GLM_FORCE_SWIZZLE)
|
||||
# define GLM_CONFIG_SWIZZLE GLM_SWIZZLE_FUNCTION
|
||||
|
Loading…
Reference in New Issue
Block a user