From 1664791bf30551584973e86ef58fcd6ef978c42b Mon Sep 17 00:00:00 2001 From: mtarini Date: Wed, 14 Oct 2009 14:30:28 +0000 Subject: [PATCH] minor: local variable rename to avoid weird compilation problems. --- vcg/simplex/edge/distance.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vcg/simplex/edge/distance.h b/vcg/simplex/edge/distance.h index 6b9a0d23..90bbf35c 100644 --- a/vcg/simplex/edge/distance.h +++ b/vcg/simplex/edge/distance.h @@ -47,12 +47,12 @@ namespace vcg { vcg::Segment3 s; s.P0()=e.V(0)->P(); s.P1()=e.V(1)->P(); - typename EdgeType::CoordType near; - near=vcg::ClosestPoint(s,q); - typename EdgeType::ScalarType d=(q-near).Norm(); + typename EdgeType::CoordType nearest; + nearest=vcg::ClosestPoint(s,q); + typename EdgeType::ScalarType d=(q-nearest).Norm(); if (d fp = Point3::Construct(p); Point3 fq; typename EDGETYPE::ScalarType md = (typename EDGETYPE::ScalarType)(minDist); - const bool ret = PointDistance(e, fp, md, fq); + const bool ret = vcg::edge::PointDistance(e, fp, md, fq); minDist = (SCALARTYPE)(md); q = Point3::Construct(fq); return (ret);