From 3b3dcd7d03f51a921bd2ac70cf615cba36c18a3a Mon Sep 17 00:00:00 2001
From: plasmacel <plasmacel@gmail.com>
Date: Mon, 24 Nov 2014 01:10:21 +0100
Subject: [PATCH] Update quaternion.hpp

---
 glm/gtc/quaternion.hpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/glm/gtc/quaternion.hpp b/glm/gtc/quaternion.hpp
index 12730932..cdf63534 100644
--- a/glm/gtc/quaternion.hpp
+++ b/glm/gtc/quaternion.hpp
@@ -102,7 +102,11 @@ namespace glm
 			template <typename U, precision Q>
 			GLM_FUNC_DECL tquat(tquat<U, Q> const & q);
 #		endif
-
+		
+		// explicit conversion operators
+		GLM_FUNC_DECL explicit operator tmat3<T, P>();
+		GLM_FUNC_DECL explicit operator tmat4<T, P>();
+		
 		/// Create a quaternion from two normalized axis
 		/// 
 		/// @param u A first normalized axis