organicmaps/glm
13
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2025-04-15 17:55:38 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Fixed merge

Browse source
This commit is contained in:
Christophe Riccio 2013-09-15 03:57:12 +02:00
parent fadbc78307
commit ba1ccbaba2
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
glm/gtx/rotate_vector.inl
View file

@ -204,7 +204,7 @@ namespace glm
if(all(equal(Normal, Up)))
return detail::tmat4x4<T, P>(T(1));
detail::tvec3<T> RotationAxis = cross(Up, Normal);
detail::tvec3<T, P> RotationAxis = cross(Up, Normal);
# ifdef GLM_FORCE_RADIANS
T Angle = acos(dot(Normal, Up));
# else