From 728c11ebb9aba8cca7d11bacd3371db097e3ac34 Mon Sep 17 00:00:00 2001 From: Alexandr Arutjunov Date: Thu, 6 Oct 2016 17:49:08 +0300 Subject: [PATCH] [*] MSVS2013 do not like constexpr --- include/assimp/matrix4x4.inl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/assimp/matrix4x4.inl b/include/assimp/matrix4x4.inl index 04c5ca304..2f579906e 100644 --- a/include/assimp/matrix4x4.inl +++ b/include/assimp/matrix4x4.inl @@ -365,7 +365,7 @@ inline void aiMatrix4x4t::Decompose(aiVector3t& pScaling, aiVector */ // Use a small epsilon to solve floating-point inaccuracies - constexpr TReal epsilon = 10e-3f; + const TReal epsilon = 10e-3f; pRotation.y = asin(vCols[2].x);// D. Angle around oY. @@ -412,7 +412,7 @@ aiQuaterniont pRotation; pRotationAngle = acos(angle_cos) * 2; // Use a small epsilon to solve floating-point inaccuracies - constexpr TReal epsilon = 10e-3f; + const TReal epsilon = 10e-3f; if(fabs(angle_sin) < epsilon) angle_sin = 1;