From 4438b3ecc9aae5156f888ecd5a9604d8e1ce638e Mon Sep 17 00:00:00 2001 From: aniongithub Date: Wed, 29 Mar 2023 18:36:18 +0000 Subject: [PATCH 1/2] Fix Issue #4486 using the fix described by @jianliang79 --- code/AssetLib/FBX/FBXConverter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/AssetLib/FBX/FBXConverter.cpp b/code/AssetLib/FBX/FBXConverter.cpp index f1f57c10b..257845384 100644 --- a/code/AssetLib/FBX/FBXConverter.cpp +++ b/code/AssetLib/FBX/FBXConverter.cpp @@ -640,7 +640,7 @@ void FBXConverter::GetRotationMatrix(Model::RotOrder mode, const aiVector3D &rot bool FBXConverter::NeedsComplexTransformationChain(const Model &model) { const PropertyTable &props = model.Props(); - const auto zero_epsilon = ai_epsilon; + const auto zero_epsilon = Math::getEpsilon(); const aiVector3D all_ones(1.0f, 1.0f, 1.0f); for (size_t i = 0; i < TransformationComp_MAXIMUM; ++i) { const TransformationComp comp = static_cast(i); From dacaebc0788848157ad6c54e1f10aa0e117fcefb Mon Sep 17 00:00:00 2001 From: Jackie9527 <80555200+Jackie9527@users.noreply.github.com> Date: Sat, 1 Apr 2023 23:49:22 +0800 Subject: [PATCH 2/2] Remove unused -Wno-shadow-field-in-constructor. Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com> --- code/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index fd3b1cb88..e05b4dd7b 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -1229,7 +1229,6 @@ IF (ASSIMP_WARNINGS_AS_ERRORS) -Wno-double-promotion -Wno-unused-macros -Wno-disabled-macro-expansion - -Wno-shadow-field-in-constructor -Wno-shadow-field -Wno-shadow -Wno-language-extension-token