Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Test to get rid of windows warning

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@518 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2012-01-20 10:52:00 +00:00
parent 48c8d78dc4
commit 20218b6df1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/OpenMesh/Core/Geometry/NormalConeT.cc
View File

@@ -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);