Spelling fixes in comments and descriptions, patch by luzpaz

Differential Revision: https://developer.blender.org/D3744

7 files changed, 17 insertions, 17 deletions

diff --git a/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp b/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp
index 8e10d06d623..2df5ecd0867 100644
--- a/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp
+++ b/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp
@@ -131,7 +131,7 @@ void CulledOccluderSource::cullViewEdges(ViewMap &viewMap, bool extensiveFEdgeSe
   GridHelpers::getDefaultViewProscenium(occluderProscenium);
 
   // XXX Freestyle is inconsistent in its use of ViewMap::viewedges_container and
-  // vector<ViewEdge*>::iterator. Probably all occurences of vector<ViewEdge*>::iterator should be
+  // vector<ViewEdge*>::iterator. Probably all occurrences of vector<ViewEdge*>::iterator should be
   // replaced ViewMap::viewedges_container throughout the code. For each view edge
   ViewMap::viewedges_container::iterator ve, veend;
 
@@ -144,7 +144,7 @@ void CulledOccluderSource::cullViewEdges(ViewMap &viewMap, bool extensiveFEdgeSe
     //        If none exists, find the feature edge with center point closest to viewport origin.
     //            Expand occluder proscenium to enclose center point.
 
-    // For each feature edge, while bestOccluderTarget not found and view edge not visibile
+    // For each feature edge, while bestOccluderTarget not found and view edge not visible
     bool bestOccluderTargetFound = false;
     FEdge *bestOccluderTarget = NULL;
     real bestOccluderDistance = 0.0;
diff --git a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
index 5c3ba1c3db3..3788b5e3545 100644
--- a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
+++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
@@ -132,7 +132,7 @@ void FEdgeXDetector::preProcessShape(WXShape *iWShape)
 
   vector<WFace *> &wfaces = iWShape->GetFaceList();
   vector<WFace *>::iterator f, fend;
-  // view dependant stuff
+  // view dependent stuff
   for (f = wfaces.begin(), fend = wfaces.end(); f != fend; ++f) {
     preProcessFace((WXFace *)(*f));
   }
@@ -226,7 +226,7 @@ void FEdgeXDetector::computeCurvatures(WXVertex *vertex)
       _minK1 = absK1;
     }
   }
-  // view dependant
+  // view dependent
   C = vertex->curvatures();
   if (C == 0) {
     return;
diff --git a/source/blender/freestyle/intern/view_map/Silhouette.h b/source/blender/freestyle/intern/view_map/Silhouette.h
index 5e9edd234ef..4168cce6bd8 100644
--- a/source/blender/freestyle/intern/view_map/Silhouette.h
+++ b/source/blender/freestyle/intern/view_map/Silhouette.h
@@ -168,7 +168,7 @@ class SVertex : public Interface0D {
 
  public:
   /*! A field that can be used by the user to store any data.
-   *  This field must be reseted afterwards using ResetUserData().
+   *  This field must be reset afterwards using ResetUserData().
    */
   void *userdata;
 
@@ -535,7 +535,7 @@ class FEdge : public Interface1D {
 
  public:
   /*! A field that can be used by the user to store any data.
-   *  This field must be reseted afterwards using ResetUserData().
+   *  This field must be reset afterwards using ResetUserData().
    */
   void *userdata;
 
diff --git a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
index fde4ee7e476..d024c360e3f 100644
--- a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
@@ -37,7 +37,7 @@ void ViewEdgeXBuilder::Init(ViewShape *oVShape)
     return;
   }
 
-  // for design conveniance, we store the current SShape.
+  // for design convenience, we store the current SShape.
   _pCurrentSShape = oVShape->sshape();
   if (0 == _pCurrentSShape) {
     return;
@@ -627,12 +627,12 @@ OWXEdge ViewEdgeXBuilder::FindNextWEdge(const OWXEdge &iEdge)
     }
 
     if (wxe->GetaVertex() == v) {
-      // That means that the face necesarily lies on the edge left.
+      // That means that the face necessarily lies on the edge left.
       // So the vertex order is OK.
       return OWXEdge(wxe, true);
     }
     else {
-      // That means that the face necesarily lies on the edge left.
+      // That means that the face necessarily lies on the edge left.
       // So the vertex order is OK.
       return OWXEdge(wxe, false);
     }
diff --git a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h
index 26f114497c0..b1934d08376 100644
--- a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h
+++ b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h
@@ -272,11 +272,11 @@ class ViewEdgeXBuilder {
   FEdge *BuildSharpFEdge(FEdge *feprevious, const OWXEdge &iwe);
 
   // GENERAL //
-  /*! Instanciate a SVertex */
+  /*! Instantiate a SVertex */
   SVertex *MakeSVertex(Vec3r &iPoint);
-  /*! Instanciate a SVertex if it hasn't been already created */
+  /*! Instantiate a SVertex if it hasn't been already created */
   SVertex *MakeSVertex(Vec3r &iPoint, bool shared);
-  /*! instanciate a ViewVertex from a SVertex, if it doesn't exist yet */
+  /*! instantiate a ViewVertex from a SVertex, if it doesn't exist yet */
   ViewVertex *MakeViewVertex(SVertex *iSVertex);
 
   // oldtmp values
diff --git a/source/blender/freestyle/intern/view_map/ViewMap.h b/source/blender/freestyle/intern/view_map/ViewMap.h
index a6ca4e3c072..83c45be8c61 100644
--- a/source/blender/freestyle/intern/view_map/ViewMap.h
+++ b/source/blender/freestyle/intern/view_map/ViewMap.h
@@ -81,7 +81,7 @@ class ViewMap {
 
  public:
   /*! A field that can be used by the user to store any data.
-   *  This field must be reseted afterwards using ResetUserData().
+   *  This field must be reset afterwards using ResetUserData().
    */
   void *userdata;
 
@@ -292,7 +292,7 @@ class ViewVertex : public Interface0D {
 
  public:
   /*! A field that can be used by the user to store any data.
-   *  This field must be reseted afterwards using ResetUserData().
+   *  This field must be reset afterwards using ResetUserData().
    */
   void *userdata;
 
@@ -962,7 +962,7 @@ class ViewEdge : public Interface1D {
 
  public:
   /*! A field that can be used by the user to store any data.
-   *  This field must be reseted afterwards using ResetUserData().
+   *  This field must be reset afterwards using ResetUserData().
    */
   void *userdata;
 
@@ -1414,7 +1414,7 @@ class ViewShape {
 
  public:
   /*! A field that can be used by the user to store any data.
-   *  This field must be reseted afterwards using ResetUserData().
+   *  This field must be reset afterwards using ResetUserData().
    */
   void *userdata;
 
diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
index aaab3936fa6..c056a25e755 100644
--- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
@@ -1137,7 +1137,7 @@ void ViewMapBuilder::CullViewEdges(ViewMap *ioViewMap,
     //        If none exists, find the feature edge with center point closest to viewport origin.
     //            Expand occluder proscenium to enclose center point.
 
-    // For each feature edge, while bestOccluderTarget not found and view edge not visibile
+    // For each feature edge, while bestOccluderTarget not found and view edge not visible
     bool bestOccluderTargetFound = false;
     FEdge *bestOccluderTarget = NULL;
     real bestOccluderDistance = 0.0;