Merge branch '0.9.2' into 0.9.3

ago%!(EXTRA string=14 years) · 2ea4c1fb87
parent 6d19231a70 dc0ae7f145
commit 2ea4c1fb87
2 changed files with 2 additions and 2 deletions
--- a/glm/core/setup.hpp
+++ b/glm/core/setup.hpp
@ -402,7 +402,7 @@

 // User defines: GLM_FORCE_INLINE GLM_FORCE_CUDA

-#if(defined(GLM_FORCE_CUDA) || (defined(GLM_COMPILER) && (GLM_COMPILER >= GLM_COMPILER_CUDA30)))
+#if(defined(GLM_FORCE_CUDA) || (defined(__CUDACC__)))
 #   define GLM_CUDA_FUNC_DEF __device__ __host__ 
 #	define GLM_CUDA_FUNC_DECL __device__ __host__ 
 #else
--- a/glm/gtx/matrix_operation.inl
+++ b/glm/gtx/matrix_operation.inl
@ -8,7 +8,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////

 namespace glm{
-namespace gtc{
+namespace gtx{
 namespace matrix_operation
 {
 	template <typename valType>