From 48c8d78dc4739ac7552ec93d3f1b5783a5cf74e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Fri, 20 Jan 2012 10:48:56 +0000 Subject: [PATCH] Test to get rid of windows warning git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@517 fdac6126-5c0c-442c-9429-916003d36597 --- src/OpenMesh/Core/Geometry/NormalConeT.cc | 2 +- src/OpenMesh/Core/Mesh/AttribKernelT.hh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/OpenMesh/Core/Geometry/NormalConeT.cc b/src/OpenMesh/Core/Geometry/NormalConeT.cc index b1ccdeaa..1b779dfd 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.5 * (maxAngle - minAngle); + angle_ = 0.5f * (maxAngle - minAngle); // axis by SLERP Scalar axisAngle = 0.5*(minAngle + maxAngle); diff --git a/src/OpenMesh/Core/Mesh/AttribKernelT.hh b/src/OpenMesh/Core/Mesh/AttribKernelT.hh index 548e9327..f23ec64a 100644 --- a/src/OpenMesh/Core/Mesh/AttribKernelT.hh +++ b/src/OpenMesh/Core/Mesh/AttribKernelT.hh @@ -691,7 +691,7 @@ public: EdgeColorsPropertyHandle edge_colors_pph() const { return edge_colors_; } -//standard face properties + //standard face properties FaceNormalsPropertyHandle face_normals_pph() const { return face_normals_; }