From 20218b6df157177a5eb8123fbd60e5960ee80036 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Fri, 20 Jan 2012 10:52:00 +0000 Subject: [PATCH] Test to get rid of windows warning git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@518 fdac6126-5c0c-442c-9429-916003d36597 --- src/OpenMesh/Core/Geometry/NormalConeT.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenMesh/Core/Geometry/NormalConeT.cc b/src/OpenMesh/Core/Geometry/NormalConeT.cc index 1b779dfd..cc1bbc0d 100644 --- a/src/OpenMesh/Core/Geometry/NormalConeT.cc +++ b/src/OpenMesh/Core/Geometry/NormalConeT.cc @@ -127,7 +127,7 @@ merge(const NormalConeT& _cone) Scalar centerAngle = acos(dotp); Scalar minAngle = std::min(-angle(), centerAngle - _cone.angle()); Scalar maxAngle = std::max( angle(), centerAngle + _cone.angle()); - angle_ = 0.5f * (maxAngle - minAngle); + angle_ = (maxAngle - minAngle) * 0.5; // axis by SLERP Scalar axisAngle = 0.5*(minAngle + maxAngle);