From 84b93872647009004027317766afee9fb139dfc8 Mon Sep 17 00:00:00 2001
From: cignoni <paolo.cignoni@isti.cnr.it>
Date: Tue, 23 Oct 2012 23:41:41 +0000
Subject: [PATCH] Removed inclusion of subset.h

---
 vcg/complex/algorithms/bitquad_support.h |  1 -
 vcg/complex/algorithms/intersection.h    | 13 +++++++------
 vcg/complex/algorithms/polygon_support.h |  1 -
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/vcg/complex/algorithms/bitquad_support.h b/vcg/complex/algorithms/bitquad_support.h
index 553dc127..202f25aa 100644
--- a/vcg/complex/algorithms/bitquad_support.h
+++ b/vcg/complex/algorithms/bitquad_support.h
@@ -2,7 +2,6 @@
 #define VCG_BITQUAD_SUPPORT
 #include <vector>
 #include <set>
-#include <vcg/complex/algorithms/subset.h>
 #include <vcg/simplex/face/jumping_pos.h>
 #include <vcg/simplex/face/topology.h>
 #include <vcg/space/planar_polygon_tessellation.h>
diff --git a/vcg/complex/algorithms/intersection.h b/vcg/complex/algorithms/intersection.h
index 16b75e4b..6b47511f 100644
--- a/vcg/complex/algorithms/intersection.h
+++ b/vcg/complex/algorithms/intersection.h
@@ -27,11 +27,12 @@
 #include<vcg/space/plane3.h>
 #include<vcg/space/segment3.h>
 #include<vcg/space/intersection3.h>
-#include<vcg/complex/allocate.h>
-#include<vcg/complex/algorithms/subset.h>
+#include<vcg/complex/complex.h>
+#include<vcg/complex/append.h>
 #include<vcg/complex/algorithms/closest.h>
 #include<vcg/complex/algorithms/update/quality.h>
-#include<vcg/complex/complex.h>
+#include<vcg/complex/algorithms/update/selection.h>
+
 
 #ifndef __VCGLIB_INTERSECTION_TRI_MESH
 #define __VCGLIB_INTERSECTION_TRI_MESH
@@ -329,13 +330,13 @@ void IntersectionBallMesh(	 TriMeshType & m, const vcg::Sphere3<ScalarType> &bal
 	std::pair<ScalarType, ScalarType> info;
 
 	if(tol == 0) tol = M_PI * ball.Radius() * ball.Radius() / 100000;
-
+	tri::UpdateSelection<TriMeshType>::FaceClear(m);
 	for(fi = m.face.begin(); fi != m.face.end(); ++fi)
 	if(!(*fi).IsD() && IntersectionSphereTriangle<ScalarType>(ball  ,(*fi), witness , &info))
-		closests.push_back(&(*fi));
+	  (*fi).SetS();
 
 	res.Clear();
-	SubSet(res,closests);
+	tri::Append<TriMeshType,TriMeshType>::Selected(res,m);
 	int i =0;
 	while(i<res.fn){
 		 bool allIn = ( ball.IsIn(res.face[i].P(0)) && ball.IsIn(res.face[i].P(1))&&ball.IsIn(res.face[i].P(2)));
diff --git a/vcg/complex/algorithms/polygon_support.h b/vcg/complex/algorithms/polygon_support.h
index c7ea8b17..dc08b2bb 100644
--- a/vcg/complex/algorithms/polygon_support.h
+++ b/vcg/complex/algorithms/polygon_support.h
@@ -25,7 +25,6 @@
 #define __VCGLIB_POLYGON_SUPPORT
 
 #include <vector>
-#include <vcg/complex/algorithms/subset.h>
 #include <vcg/simplex/face/jumping_pos.h>
 #include <vcg/space/planar_polygon_tessellation.h>