diff options
| author | Mike Krus <mike.krus@kdab.com> | 2018-04-04 09:53:27 +0100 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2018-04-09 11:51:08 +0000 |
| commit | 5247d7146c65672bd245ceb0dc213dfb319919c4 (patch) | |
| tree | 87159d0f24af725bb7c01c7495d71b3cc4bc76c2 /src/3rdparty/assimp/code/FixNormalsStep.cpp | |
| parent | af4972fd15e6b11a99c631ff91b3360ceb8be5cc (diff) | |
Update Assimp to 4.1
Fixes build with C++17 / XCode 9.3
Change-Id: Ic1c19cc4b86e54e72dd4cfe054ec6d66f64b5a07
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src/3rdparty/assimp/code/FixNormalsStep.cpp')
| -rw-r--r-- | src/3rdparty/assimp/code/FixNormalsStep.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/3rdparty/assimp/code/FixNormalsStep.cpp b/src/3rdparty/assimp/code/FixNormalsStep.cpp index 9249b13e9..05d05e873 100644 --- a/src/3rdparty/assimp/code/FixNormalsStep.cpp +++ b/src/3rdparty/assimp/code/FixNormalsStep.cpp @@ -3,7 +3,8 @@ Open Asset Import Library (assimp) --------------------------------------------------------------------------- -Copyright (c) 2006-2016, assimp team +Copyright (c) 2006-2017, assimp team + All rights reserved. @@ -148,9 +149,9 @@ bool FixInfacingNormalsProcess::ProcessMesh( aiMesh* pcMesh, unsigned int index) // Check whether this is a planar surface const float fDelta1_yz = fDelta1_y * fDelta1_z; - if (fDelta1_x < 0.05f * sqrtf( fDelta1_yz ))return false; - if (fDelta1_y < 0.05f * sqrtf( fDelta1_z * fDelta1_x ))return false; - if (fDelta1_z < 0.05f * sqrtf( fDelta1_y * fDelta1_x ))return false; + if (fDelta1_x < 0.05f * std::sqrt( fDelta1_yz ))return false; + if (fDelta1_y < 0.05f * std::sqrt( fDelta1_z * fDelta1_x ))return false; + if (fDelta1_z < 0.05f * std::sqrt( fDelta1_y * fDelta1_x ))return false; // now compare the volumes of the bounding boxes if (std::fabs(fDelta0_x * fDelta0_y * fDelta0_z) < |