Merge branch 'master' into master
commit
0bef3a2e0b
|
@ -237,7 +237,8 @@ inline void aiQuaterniont<TReal>::Interpolate( aiQuaterniont& pOut, const aiQuat
|
||||||
|
|
||||||
// Calculate coefficients
|
// Calculate coefficients
|
||||||
TReal sclp, sclq;
|
TReal sclp, sclq;
|
||||||
if( (static_cast<TReal>(1.0) - cosom) > static_cast<TReal>(0.0001)) // 0.0001 -> some epsillon
|
|
||||||
|
if ((static_cast<TReal>(1.0) - cosom) > ai_epsilon) // 0.0001 -> some epsillon
|
||||||
{
|
{
|
||||||
// Standard case (slerp)
|
// Standard case (slerp)
|
||||||
TReal omega, sinom;
|
TReal omega, sinom;
|
||||||
|
|
Loading…
Reference in New Issue