mirror of
https://github.com/g-truc/glm.git
synced 2024-11-10 04:31:47 +00:00
Fixed merge
This commit is contained in:
parent
fadbc78307
commit
ba1ccbaba2
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user