From 50af4d208d7d2f3cbc789e91e54d87adf37590fb Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Fri, 3 Oct 2014 08:09:00 +0200
Subject: Cleanup: spelling, ws

---
 .../freestyle/intern/view_map/FEdgeXDetector.cpp   | 24 +++++++++++-----------
 .../freestyle/intern/view_map/FEdgeXDetector.h     |  4 ++--
 .../blender/freestyle/intern/winged_edge/WXEdge.h  | 14 ++++++-------
 3 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'source/blender/freestyle/intern')

diff --git a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
index 9c9cd88f188..a5e526fc490 100644
--- a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
+++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
@@ -63,14 +63,14 @@ void FEdgeXDetector::processShapes(WingedEdge& we)
 				WXFace *wxf = dynamic_cast<WXFace*>(*wf);
 				wxf->Clear();
 			}
-			_computeViewIndependant = true;
+			_computeViewIndependent = true;
 		}
-		else if (!(wxs)->getComputeViewIndependantFlag()) {
+		else if (!(wxs)->getComputeViewIndependentFlag()) {
 			wxs->Reset();
-			_computeViewIndependant = false;
+			_computeViewIndependent = false;
 		}
 		else {
-			_computeViewIndependant = true;
+			_computeViewIndependent = true;
 		}
 		preProcessShape(wxs);
 		if (progressBarDisplay)
@@ -97,8 +97,8 @@ void FEdgeXDetector::processShapes(WingedEdge& we)
 		if (progressBarDisplay)
 			_pProgressBar->setProgress(_pProgressBar->getProgress() + 1);
 
-		wxs->setComputeViewIndependantFlag(false);
-		_computeViewIndependant = false;
+		wxs->setComputeViewIndependentFlag(false);
+		_computeViewIndependent = false;
 		_changes = false;
 
 		// reset user data
@@ -187,8 +187,8 @@ void FEdgeXDetector::computeCurvatures(WXVertex *vertex)
 	CurvatureInfo *C;
 	float radius = _sphereRadius * _meanEdgeSize; 
 
-	// view independant stuff
-	if (_computeViewIndependant) {
+	// view independent stuff
+	if (_computeViewIndependent) {
 		C = new CurvatureInfo();
 		vertex->setCurvatures(C);
 		OGF::NormalCycle ncycle;
@@ -333,7 +333,7 @@ void FEdgeXDetector::ProcessSilhouetteEdge(WXEdge *iEdge)
 /////////
 void FEdgeXDetector::processBorderShape(WXShape *iWShape)
 {
-	if (!_computeViewIndependant)
+	if (!_computeViewIndependent)
 		return;
 	// Make a pass on the edges to detect the BORDER
 	vector<WEdge*>::iterator we, weend;
@@ -358,7 +358,7 @@ void FEdgeXDetector::ProcessBorderEdge(WXEdge *iEdge)
 /////////
 void FEdgeXDetector::processCreaseShape(WXShape *iWShape)
 {
-	if (!_computeViewIndependant)
+	if (!_computeViewIndependent)
 		return;
 
 	// Make a pass on the edges to detect the CREASE 
@@ -390,7 +390,7 @@ void FEdgeXDetector::processRidgesAndValleysShape(WXShape *iWShape)
 	// Don't forget to add the built layer to the face at the end of the ProcessFace:
 	//iFace->AddSmoothLayer(faceLayer);
 
-	if (!_computeViewIndependant)
+	if (!_computeViewIndependent)
 		return;
 
 	// Here the curvatures must already have been computed
@@ -684,7 +684,7 @@ void FEdgeXDetector::postProcessSuggestiveContourFace(WXFace *iFace)
 ////////////////////
 void FEdgeXDetector::processMaterialBoundaryShape(WXShape *iWShape)
 {
-	if (!_computeViewIndependant)
+	if (!_computeViewIndependent)
 		return;
 	// Make a pass on the edges to detect material boundaries
 	vector<WEdge*>::iterator we, weend;
diff --git a/source/blender/freestyle/intern/view_map/FEdgeXDetector.h b/source/blender/freestyle/intern/view_map/FEdgeXDetector.h
index 8adf685a6eb..8170fc5baab 100644
--- a/source/blender/freestyle/intern/view_map/FEdgeXDetector.h
+++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.h
@@ -57,7 +57,7 @@ public:
 	{
 		_pProgressBar = NULL;
 		_pRenderMonitor = NULL;
-		_computeViewIndependant = true;
+		_computeViewIndependent = true;
 		_bbox_diagonal = 1.0;
 		_meanEdgeSize = 0;
 		_computeRidgesAndValleys = true;
@@ -213,7 +213,7 @@ protected:
 	Vec3r _Viewpoint;
 	real _bbox_diagonal; // diagonal of the current processed shape bbox
 	//oldtmp values
-	bool _computeViewIndependant;
+	bool _computeViewIndependent;
 	real _meanK1;
 	real _meanKr;
 	real _minK1;
diff --git a/source/blender/freestyle/intern/winged_edge/WXEdge.h b/source/blender/freestyle/intern/winged_edge/WXEdge.h
index ce9749369fc..3c9ec7a7e3d 100644
--- a/source/blender/freestyle/intern/winged_edge/WXEdge.h
+++ b/source/blender/freestyle/intern/winged_edge/WXEdge.h
@@ -718,18 +718,18 @@ public:
 	typedef WXShape type_name;
 
 protected:
-	bool _computeViewIndependant; // flag to indicate whether the view independant stuff must be computed or not
+	bool _computeViewIndependent; // flag to indicate whether the view independent stuff must be computed or not
 
 public:
 	inline WXShape() : WShape()
 	{
-		_computeViewIndependant = true;
+		_computeViewIndependent = true;
 	}
 
 	/*! copy constructor */
 	inline WXShape(WXShape& iBrother) : WShape(iBrother)
 	{
-		_computeViewIndependant = iBrother._computeViewIndependant;
+		_computeViewIndependent = iBrother._computeViewIndependent;
 	}
 
 	virtual WShape *duplicate()
@@ -740,14 +740,14 @@ public:
 
 	virtual ~WXShape() {}
 
-	inline bool getComputeViewIndependantFlag() const
+	inline bool getComputeViewIndependentFlag() const
 	{
-		return _computeViewIndependant;
+		return _computeViewIndependent;
 	}
 
-	inline void setComputeViewIndependantFlag(bool iFlag)
+	inline void setComputeViewIndependentFlag(bool iFlag)
 	{
-		_computeViewIndependant = iFlag;
+		_computeViewIndependent = iFlag;
 	}
 
 	/*! designed to build a specialized WFace for use in MakeFace */
-- 
cgit v1.2.3