Browse Source

Fixed missing explicit convertion when using integer log2 with *vec1 types

Christophe Riccio 11 years ago
parent
commit
f026e722ee
2 changed files with 2 additions and 1 deletions
  1. 1 1
      glm/gtc/integer.inl
  2. 1 0
      readme.txt

+ 1 - 1
glm/gtc/integer.inl

@@ -40,7 +40,7 @@ namespace detail
 		{
 		{
 			//Equivalent to return findMSB(vec); but save one function call in ASM with VC
 			//Equivalent to return findMSB(vec); but save one function call in ASM with VC
 			//return findMSB(vec);
 			//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));
 		}
 		}
 	};
 	};
 
 

+ 1 - 0
readme.txt

@@ -68,6 +68,7 @@ GLM 0.9.6.1: 2014-12-XX
 Fixes:
 Fixes:
 - Fixed scalar uaddCarry build error with Cuda #276
 - Fixed scalar uaddCarry build error with Cuda #276
 - Fixed C++11 explicit conversion operators detection #282
 - 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
 GLM 0.9.6.0: 2014-11-30