Merge branch 'master' into msvc-clang-nested-anon-types

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<ai_real>();
     const aiVector3D all_ones(1.0f, 1.0f, 1.0f);
     for (size_t i = 0; i < TransformationComp_MAXIMUM; ++i) {
         const TransformationComp comp = static_cast<TransformationComp>(i);

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