From a73987d863432e2cc8a4d8c06ab44e7132b0d2cc Mon Sep 17 00:00:00 2001 From: RohacekD Date: Tue, 8 Dec 2020 01:19:39 +0100 Subject: [PATCH] Adding constexpr for conjugate --- glm/ext/quaternion_common.hpp | 2 +- glm/ext/quaternion_common.inl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/glm/ext/quaternion_common.hpp b/glm/ext/quaternion_common.hpp index f519d559..c9163609 100644 --- a/glm/ext/quaternion_common.hpp +++ b/glm/ext/quaternion_common.hpp @@ -96,7 +96,7 @@ namespace glm /// @tparam T A floating-point scalar type /// @tparam Q A value from qualifier enum template - GLM_FUNC_DECL qua conjugate(qua const& q); + GLM_FUNC_DECL GLM_CONSTEXPR qua conjugate(qua const& q); /// Returns the q inverse. /// diff --git a/glm/ext/quaternion_common.inl b/glm/ext/quaternion_common.inl index 0e4a3bb2..4d6869e5 100644 --- a/glm/ext/quaternion_common.inl +++ b/glm/ext/quaternion_common.inl @@ -110,7 +110,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER qua conjugate(qua const& q) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua conjugate(qua const& q) { return qua(q.w, -q.x, -q.y, -q.z); }