Merge branch '0.9.1' into 0.9.2

This commit is contained in:
Christophe Riccio 2011-05-07 14:59:12 +01:00
commit e0a71fda81

View File

@ -256,7 +256,7 @@ namespace detail
GLM_FUNC_QUALIFIER thalf::operator float() const GLM_FUNC_QUALIFIER thalf::operator float() const
{ {
return toFloat(); return toFloat32(this->data);
} }
//GLM_FUNC_QUALIFIER half::operator double() //GLM_FUNC_QUALIFIER half::operator double()