Merge branch 'master' into x3d_pugi_migration_artenuvielle

2021-09-12 11:45:00 +02:00
parent dfb0d66437 d34cd103f4
commit c7e9c6580a
6 changed files with 8 additions and 5 deletions
--- a/code/PostProcessing/CalcTangentsProcess.cpp
+++ b/code/PostProcessing/CalcTangentsProcess.cpp
@@ -56,7 +56,7 @@ using namespace Assimp;
 // ------------------------------------------------------------------------------------------------
 // Constructor to be privately used by Importer
 CalcTangentsProcess::CalcTangentsProcess() :
-        configMaxAngle(AI_DEG_TO_RAD(45.f)), configSourceUV(0) {
+        configMaxAngle(float(AI_DEG_TO_RAD(45.f))), configSourceUV(0) {
    // nothing to do here
 }