v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

pull/5040/head
Kim Kulling 2023-04-03 19:59:59 +02:00 committed by GitHub
parent 6b54761310 df21b6799f
commit d6885d4025
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/AssetLib/FBX/FBXConverter.cpp
View File

@ -640,7 +640,7 @@ void FBXConverter::GetRotationMatrix(Model::RotOrder mode, const aiVector3D &rot
bool FBXConverter::NeedsComplexTransformationChain(const Model &model) { bool FBXConverter::NeedsComplexTransformationChain(const Model &model) {
const PropertyTable &props = model.Props(); 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); const aiVector3D all_ones(1.0f, 1.0f, 1.0f);
for (size_t i = 0; i < TransformationComp_MAXIMUM; ++i) { for (size_t i = 0; i < TransformationComp_MAXIMUM; ++i) {
const TransformationComp comp = static_cast<TransformationComp>(i); const TransformationComp comp = static_cast<TransformationComp>(i);

1
code/CMakeLists.txt
View File

@ -1229,7 +1229,6 @@ IF (ASSIMP_WARNINGS_AS_ERRORS)
-Wno-double-promotion -Wno-double-promotion
-Wno-unused-macros -Wno-unused-macros
-Wno-disabled-macro-expansion -Wno-disabled-macro-expansion
-Wno-shadow-field-in-constructor
-Wno-shadow-field -Wno-shadow-field
-Wno-shadow -Wno-shadow
-Wno-language-extension-token -Wno-language-extension-token