From f026e722ee210b45f0c77e6def7113551efdc058 Mon Sep 17 00:00:00 2001
From: Christophe Riccio <mail@g-truc.net>
Date: Wed, 3 Dec 2014 23:23:24 +0100
Subject: [PATCH] Fixed missing explicit convertion when using integer log2
 with *vec1 types

---
 glm/gtc/integer.inl | 2 +-
 readme.txt          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/glm/gtc/integer.inl b/glm/gtc/integer.inl
index 5a23f0b2..c7bb36d8 100644
--- a/glm/gtc/integer.inl
+++ b/glm/gtc/integer.inl
@@ -40,7 +40,7 @@ namespace detail
 		{
 			//Equivalent to return findMSB(vec); but save one function call in ASM with VC
 			//return findMSB(vec);
-			return detail::compute_findMSB_vec<T, P, vecType, sizeof(T) * 8>::call(vec);
+			return vecType<T, P>(detail::compute_findMSB_vec<T, P, vecType, sizeof(T) * 8>::call(vec));
 		}
 	};
 
diff --git a/readme.txt b/readme.txt
index 97a40c66..5027ddff 100644
--- a/readme.txt
+++ b/readme.txt
@@ -68,6 +68,7 @@ GLM 0.9.6.1: 2014-12-XX
 Fixes:
 - Fixed scalar uaddCarry build error with Cuda #276
 - Fixed C++11 explicit conversion operators detection #282
+- Fixed missing explicit convertion when using integer log2 with *vec1 types
 
 ================================================================================
 GLM 0.9.6.0: 2014-11-30