From dcffcbdc97967fe37167691a010ea26fc0c8cc6d Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Wed, 18 May 2016 22:52:47 +0200 Subject: [PATCH] Fixed GLM_FORCE_INLINE with binary vec4 operators --- glm/detail/type_vec4.inl | 6 +++--- readme.md | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/glm/detail/type_vec4.inl b/glm/detail/type_vec4.inl index 9b35d0b1..c38f886b 100644 --- a/glm/detail/type_vec4.inl +++ b/glm/detail/type_vec4.inl @@ -744,7 +744,7 @@ namespace glm } template - GLM_FUNC_DECL tvec4 operator-(tvec1 const & v1, tvec4 const & v2) + GLM_FUNC_QUALIFIER tvec4 operator-(tvec1 const & v1, tvec4 const & v2) { return tvec4( v1.x - v2.x, @@ -794,7 +794,7 @@ namespace glm } template - GLM_FUNC_DECL tvec4 operator*(tvec1 const & v1, tvec4 const & v2) + GLM_FUNC_QUALIFIER tvec4 operator*(tvec1 const & v1, tvec4 const & v2) { return tvec4( v1.x * v2.x, @@ -844,7 +844,7 @@ namespace glm } template - GLM_FUNC_DECL tvec4 operator/(tvec1 const & v1, tvec4 const & v2) + GLM_FUNC_QUALIFIER tvec4 operator/(tvec1 const & v1, tvec4 const & v2) { return tvec4( v1.x / v2.x, diff --git a/readme.md b/readme.md index ab4f1c34..c77476a7 100644 --- a/readme.md +++ b/readme.md @@ -57,6 +57,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate) - Fixed roundPowerOfTwo and floorPowerOfTwo #503 - Fixed Visual C++ SIMD instruction set automatic detection in 64 bits - Fixed to_string when used with GLM_FORCE_INLINE #506 +- Fixed GLM_FORCE_INLINE with binary vec4 operators #### [GLM 0.9.7.4](https://github.com/g-truc/glm/releases/tag/0.9.7.4) - 2016-03-19 ##### Fixes: