From 197d78454989fae9df839f2ca0c407464c622355 Mon Sep 17 00:00:00 2001
From: Christophe Riccio <email@g-truc.net>
Date: Fri, 27 May 2011 00:27:52 +0100
Subject: [PATCH] Fixed quat mix build

---
 glm/gtc/quaternion.hpp |  7 ++++++-
 glm/gtc/quaternion.inl | 14 ++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/glm/gtc/quaternion.hpp b/glm/gtc/quaternion.hpp
index f6238ccd..949f08f7 100644
--- a/glm/gtc/quaternion.hpp
+++ b/glm/gtc/quaternion.hpp
@@ -74,6 +74,11 @@ namespace detail
 	detail::tquat<T> operator- (
 		detail::tquat<T> const & q);
 
+	template <typename T> 
+	detail::tquat<T> operator+ ( 
+		detail::tquat<T> const & q, 
+		detail::tquat<T> const & p); 
+
 	template <typename T> 
 	detail::tquat<T> operator* ( 
 		detail::tquat<T> const & q, 
@@ -154,7 +159,7 @@ namespace quaternion ///< GLM_GTC_quaternion extension: Quaternion types and fun
 	detail::tquat<T> mix(
 		detail::tquat<T> const & x, 
 		detail::tquat<T> const & y, 
-		typename detail::tquat<T>::value_type const & a);
+		T const & a);
 		
 	//! Returns the q conjugate. 
 	//! From GLM_GTC_quaternion extension.
diff --git a/glm/gtc/quaternion.inl b/glm/gtc/quaternion.inl
index 27a5c541..e262c663 100644
--- a/glm/gtc/quaternion.inl
+++ b/glm/gtc/quaternion.inl
@@ -156,6 +156,20 @@ namespace detail{
 		return detail::tquat<T>(-q.w, -q.x, -q.y, -q.z);
 	}
 
+	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*
 	(