Commit 48c8d78d authored by Jan Möbius's avatar Jan Möbius

Test to get rid of windows warning

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@517 fdac6126-5c0c-442c-9429-916003d36597
parent d7ba33a8
......@@ -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);
......
......@@ -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_; }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment