MSVC: fix warnings about conversion between float and double

2023-11-21 21:20:29 +01:00
parent de7c598b33
commit 41afcf41e6
2 changed files with 5 additions and 1 deletions
--- a/src/Gui/NavigationAnimation.cpp
+++ b/src/Gui/NavigationAnimation.cpp
@@ -66,7 +66,7 @@ void FixedTimeAnimation::initialize()
    float angle;
    SbRotation(navigation->getCamera()->orientation.getValue().inverse() * targetOrientation).getValue(rotationAxisPost, angle);
    if (angle > M_PI) {
-        angle -= 2 * M_PI;
+        angle -= float(2 * M_PI);
    }

    // Convert post-multiplication axis to a pre-multiplication axis
--- a/tests/src/Mod/Material/App/TestMaterials.cpp
+++ b/tests/src/Mod/Material/App/TestMaterials.cpp
@@ -38,6 +38,10 @@
 #include <Mod/Material/App/ModelManager.h>
 #include <Mod/Material/App/ModelUuids.h>

+#ifdef _MSC_VER
+#pragma warning(disable : 4834)
+#endif
+
 // clang-format off

 class TestMaterial : public ::testing::Test {