From 78b8d392f4946b1df8a91ba294be052eeaeefb95 Mon Sep 17 00:00:00 2001
From: Paolo Cignoni cignoni <paolo.cignoni@isti.cnr.it>
Date: Tue, 13 Dec 2011 15:07:46 +0000
Subject: [PATCH] other few changes connected to the disappearing of the hated
 faceprojection flags...

---
 src/meshlabplugins/filter_sampling/filter_sampling.cpp | 9 ++-------
 src/meshlabplugins/filter_sdf/filter_sdf.cpp           | 3 +--
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/meshlabplugins/filter_sampling/filter_sampling.cpp b/src/meshlabplugins/filter_sampling/filter_sampling.cpp
index b7adea26b..aca4ff27f 100644
--- a/src/meshlabplugins/filter_sampling/filter_sampling.cpp
+++ b/src/meshlabplugins/filter_sampling/filter_sampling.cpp
@@ -123,7 +123,7 @@ class HausdorffSampler
 	typedef GridStaticPtr<CMeshO::VertexType, CMeshO::ScalarType > MetroMeshVertexGrid;
 public:
   
-	HausdorffSampler(CMeshO* _m=0,CMeshO* _sampleMesh=0, CMeshO* _closestMesh=0 )
+  HausdorffSampler(CMeshO* _m=0,CMeshO* _sampleMesh=0, CMeshO* _closestMesh=0 ) :markerFunctor(_m)
 	{
 		init(_m,_sampleMesh,_closestMesh);
 	};
@@ -165,7 +165,6 @@ public:
 		if(m) 
 		{
 			tri::UpdateNormals<CMeshO>::PerFaceNormalized(*m);
-			tri::UpdateFlags<CMeshO>::FaceProjection(*m);
       if(m->fn==0) useVertexSampling = true;
               else useVertexSampling = false;
 
@@ -251,7 +250,7 @@ class RedetailSampler
 
 public:
 
-	RedetailSampler()
+	RedetailSampler():markerFunctor(0)
 	{
 		m=0;		
 	};
@@ -286,7 +285,6 @@ public:
 		if(m) 
 		{
 			tri::UpdateNormals<CMeshO>::PerFaceNormalized(*m);
-			tri::UpdateFlags<CMeshO>::FaceProjection(*m);
 			if(m->fn==0) useVertexSampling = true;
 							else useVertexSampling = false;
 							
@@ -898,7 +896,6 @@ case FP_CLUSTERED_SAMPLING :
             mm1->updateDataMask(MeshModel::MM_VERTQUALITY);
 			mm1->updateDataMask(MeshModel::MM_FACEMARK);
 			tri::UpdateNormals<CMeshO>::PerFaceNormalized(mm1->cm);
-			tri::UpdateFlags<CMeshO>::FaceProjection(mm1->cm);
 
 			MeshModel *samplePtMesh =0; 
 			MeshModel *closestPtMesh =0; 
@@ -950,7 +947,6 @@ case FP_CLUSTERED_SAMPLING :
 			float upperbound = par.getAbsPerc("UpperBound"); // maximum distance to stop search
 			srcMesh->updateDataMask(MeshModel::MM_FACEMARK);
 			tri::UpdateNormals<CMeshO>::PerFaceNormalized(srcMesh->cm);
-			tri::UpdateFlags<CMeshO>::FaceProjection(srcMesh->cm);
 
 		  RedetailSampler rs;
 			rs.init(&(srcMesh->cm),cb,trgMesh->cm.vn);
@@ -1131,7 +1127,6 @@ case FP_CLUSTERED_SAMPLING :
 			tri::Allocator<CMeshO>::CompactFaceVector(mmM->cm);
 
 			tri::UpdateNormals<CMeshO>::PerFaceNormalized(mmM->cm);
-			tri::UpdateFlags<CMeshO>::FaceProjection(mmM->cm);
 			std::vector<Point3f> pvec;
 	
 			tri::SurfaceSampling<CMeshO,RedetailSampler>::RegularRecursiveOffset(mmM->cm,pvec, offset, CellSize);
diff --git a/src/meshlabplugins/filter_sdf/filter_sdf.cpp b/src/meshlabplugins/filter_sdf/filter_sdf.cpp
index c943b4685..f90d92245 100644
--- a/src/meshlabplugins/filter_sdf/filter_sdf.cpp
+++ b/src/meshlabplugins/filter_sdf/filter_sdf.cpp
@@ -72,8 +72,7 @@ bool SdfPlugin::applyFilter(MeshDocument& md, RichParameterSet& pars, vcg::CallB
   tri::UpdateNormals<CMeshO>::PerFaceNormalized(m);
   tri::UpdateNormals<CMeshO>::PerVertexAngleWeighted(m);
   tri::UpdateNormals<CMeshO>::NormalizeVertex(m);
-  tri::UpdateFlags<CMeshO>::FaceProjection(m);
-    
+
   //--- Enable & Reset the necessary attributes
   switch(onPrimitive){
     case ON_VERTICES: