From 0add130eea25c89cdf53d380a43828f446abd96a Mon Sep 17 00:00:00 2001
From: Irlan <->
Date: Mon, 30 Apr 2018 15:51:42 -0300
Subject: [PATCH] rename function

---
 include/bounce/quickhull/qh_hull.h | 8 ++++----
 src/bounce/quickhull/qh_hull.cpp   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/bounce/quickhull/qh_hull.h b/include/bounce/quickhull/qh_hull.h
index 2072cd2..0c64d39 100644
--- a/include/bounce/quickhull/qh_hull.h
+++ b/include/bounce/quickhull/qh_hull.h
@@ -129,6 +129,8 @@ private:
 
 	qhFace* AddFace(qhVertex* v1, qhVertex* v2, qhVertex* v3);
 	qhFace* RemoveFace(qhFace* face);
+	
+	bool MergeFace(qhFace* face);
 
 	qhHalfEdge* FindHalfEdge(const qhVertex* v1, const qhVertex* v2) const;
 
@@ -141,10 +143,8 @@ private:
 	void FindHorizon(qhVertex* eye);
 
 	void AddNewFaces(qhVertex* eye);
-
-	void MergeFaces();
-	bool MergeFace(qhFace* face);
-
+	void MergeNewFaces();
+	
 	// List of vertices
 	qhList<qhVertex> m_vertexList;
 	
diff --git a/src/bounce/quickhull/qh_hull.cpp b/src/bounce/quickhull/qh_hull.cpp
index 1b32d94..df73c31 100644
--- a/src/bounce/quickhull/qh_hull.cpp
+++ b/src/bounce/quickhull/qh_hull.cpp
@@ -349,7 +349,7 @@ void qhHull::AddEyeVertex(qhVertex* eye)
 {
 	FindHorizon(eye);
 	AddNewFaces(eye);
-	MergeFaces();
+	MergeNewFaces();
 }
 
 void qhHull::FindHorizon(qhVertex* eye)
@@ -807,7 +807,7 @@ bool qhHull::MergeFace(qhFace* rightFace)
 	return false;
 }
 
-void qhHull::MergeFaces()
+void qhHull::MergeNewFaces()
 {
 	for (u32 i = 0; i < m_newFaceCount; ++i)
 	{