mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-23 09:14:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.9.2' into noise

Browse Source
This commit is contained in:
Christophe Riccio 2011-04-21 17:21:15 +01:00
commit 477382f798
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glm/gtc/type_ptr.hpp
View File

@ -426,7 +426,7 @@ namespace glm
//! Build a matrix from a pointer. //! Build a matrix from a pointer.
//! From GLM_GTC_type_ptr extension. //! From GLM_GTC_type_ptr extension.
template<typename T> template<typename T>
inline detail::tmat3<T> make_mat3(T const * const ptr) inline detail::tmat3x3<T> make_mat3(T const * const ptr)
{ {
return make_mat3x3(Result); return make_mat3x3(Result);
} }
@ -434,7 +434,7 @@ namespace glm
//! Build a matrix from a pointer. //! Build a matrix from a pointer.
//! From GLM_GTC_type_ptr extension. //! From GLM_GTC_type_ptr extension.
template<typename T> template<typename T>
inline detail::tmat4<T> make_mat4(T const * const ptr) inline detail::tmat4x4<T> make_mat4(T const * const ptr)
{ {
return make_mat4x4(Result); return make_mat4x4(Result);
} }