From d815607abb425150d7c608668f2c9f3142f56f73 Mon Sep 17 00:00:00 2001
From: Christophe Riccio <mail@g-truc.net>
Date: Thu, 26 May 2011 22:01:28 +0100
Subject: [PATCH] Fixed slerp

---
 glm/gtc/quaternion.inl | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/glm/gtc/quaternion.inl b/glm/gtc/quaternion.inl
index 27a5c541..d4e33aaa 100644
--- a/glm/gtc/quaternion.inl
+++ b/glm/gtc/quaternion.inl
@@ -147,6 +147,20 @@ namespace detail{
     //////////////////////////////////////////////////////////////
     // tquat<valType> external operators
 
+    template <typename T> 
+    GLM_FUNC_QUALIFIER detail::tquat<T> operator*
+    ( 
+        detail::tquat<T> const & q, 
+        detail::tquat<T> const & p
+    ) 
+    { 
+        return detail::tquat<T>(
+            q.w + p.w,
+            q.x + p.x,
+            q.y + p.y,
+            q.z + p.z);
+    } 
+
 	template <typename T>
 	GLM_FUNC_QUALIFIER detail::tquat<T> operator- 
 	(