mirror of
https://github.com/g-truc/glm.git
synced 2024-11-23 09:14:34 +00:00
Merge branch '0.9.2' into noise
This commit is contained in:
commit
68ccdb2c0f
@ -15,6 +15,7 @@
|
||||
|
||||
// Dependency:
|
||||
#include "../glm.hpp"
|
||||
#include <cstring>
|
||||
|
||||
#if(defined(GLM_MESSAGES) && !defined(glm_ext))
|
||||
# pragma message("GLM: GLM_GTC_type_ptr extension included")
|
||||
@ -420,7 +421,7 @@ namespace glm
|
||||
template<typename T>
|
||||
inline detail::tmat2x2<T> make_mat2(T const * const ptr)
|
||||
{
|
||||
return make_mat2x2(Result);
|
||||
return make_mat2x2(ptr);
|
||||
}
|
||||
|
||||
//! Build a matrix from a pointer.
|
||||
@ -428,7 +429,7 @@ namespace glm
|
||||
template<typename T>
|
||||
inline detail::tmat3x3<T> make_mat3(T const * const ptr)
|
||||
{
|
||||
return make_mat3x3(Result);
|
||||
return make_mat3x3(ptr);
|
||||
}
|
||||
|
||||
//! Build a matrix from a pointer.
|
||||
@ -436,7 +437,7 @@ namespace glm
|
||||
template<typename T>
|
||||
inline detail::tmat4x4<T> make_mat4(T const * const ptr)
|
||||
{
|
||||
return make_mat4x4(Result);
|
||||
return make_mat4x4(ptr);
|
||||
}
|
||||
|
||||
///@}
|
||||
|
Loading…
Reference in New Issue
Block a user