From 41afcf41e63054d3e5a6f1784ba5c298bf1fc377 Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 21 Nov 2023 21:20:29 +0100 Subject: [PATCH] MSVC: fix warnings about conversion between float and double --- src/Gui/NavigationAnimation.cpp | 2 +- tests/src/Mod/Material/App/TestMaterials.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Gui/NavigationAnimation.cpp b/src/Gui/NavigationAnimation.cpp index 8294c154f9..9b0c9a595c 100644 --- 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 diff --git a/tests/src/Mod/Material/App/TestMaterials.cpp b/tests/src/Mod/Material/App/TestMaterials.cpp index 808f09fc7e..24a4f8d60f 100644 --- a/tests/src/Mod/Material/App/TestMaterials.cpp +++ b/tests/src/Mod/Material/App/TestMaterials.cpp @@ -38,6 +38,10 @@ #include #include +#ifdef _MSC_VER +#pragma warning(disable : 4834) +#endif + // clang-format off class TestMaterial : public ::testing::Test {