code cleanup:

- add missing headers from cmake (own omission)
- quiet rna_test.c unused define warnings.
- minor style edits
- spelling corrections and ignore all uppercase words with spell checking script.

8 files changed, 9 insertions, 9 deletions

diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
index 9b915df03d1..869ada0d058 100644
--- a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
@@ -44,7 +44,7 @@ PyDoc_STRVAR(ViewEdge_doc,
 "Class hierarchy: :class:`Interface1D` > :class:`ViewEdge`\n"
 "\n"
 "Class defining a ViewEdge.  A ViewEdge in an edge of the image graph.\n"
-"it connnects two :class:`ViewVertex` objects.  It is made by connecting\n"
+"it connects two :class:`ViewVertex` objects.  It is made by connecting\n"
 "a set of FEdges.\n"
 "\n"
 ".. method:: __init__()\n"
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp
index 18815ab6f62..b54ed48edc3 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp
@@ -48,7 +48,7 @@ static char MaterialF0D___doc__[] =
 "   evaluation can be ambiguous (in the case of a :class:`TVertex` for\n"
 "   example.  This functor tries to remove this ambiguity using the\n"
 "   context offered by the 1D element to which the Interface0DIterator\n"
-"   belongs to and by arbitrary chosing the material of the face that\n"
+"   belongs to and by arbitrary choosing the material of the face that\n"
 "   lies on its left when following the 1D element if there are two\n"
 "   different materials on each side of the point.  However, there\n"
 "   still can be problematic cases, and the user willing to deal with\n"
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp
index 8f7fccb5293..b64f6c06e93 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp
@@ -47,7 +47,7 @@ static char ZDiscontinuityF0D___doc__[] =
 "   :class:`Interface0D` pointed by the Interface0DIterator and the\n"
 "   shape that lies behind (occludee).  This distance is evaluated in\n"
 "   the camera space and normalized between 0 and 1.  Therefore, if no\n"
-"   oject is occluded by the shape to which the Interface0D belongs to,\n"
+"   object is occluded by the shape to which the Interface0D belongs to,\n"
 "   1 is returned.\n"
 "\n"
 "   :arg it: An Interface0DIterator object.\n"
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.cpp
index 5c3dc3eed9f..65fde596e23 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.cpp
@@ -52,7 +52,7 @@ static char ZDiscontinuityF1D___doc__[] =
 "   Returns a real value giving the distance between an Interface1D\n"
 "   and the shape that lies behind (occludee).  This distance is\n"
 "   evaluated in the camera space and normalized between 0 and 1.\n"
-"   Therefore, if no oject is occluded by the shape to which the\n"
+"   Therefore, if no object is occluded by the shape to which the\n"
 "   Interface1D belongs to, 1 is returned.\n"
 "\n"
 "   :arg inter: An Interface1D object.\n"
diff --git a/source/blender/freestyle/intern/view_map/Functions0D.h b/source/blender/freestyle/intern/view_map/Functions0D.h
index 69f6f42e022..e9474191319 100644
--- a/source/blender/freestyle/intern/view_map/Functions0D.h
+++ b/source/blender/freestyle/intern/view_map/Functions0D.h
@@ -346,7 +346,7 @@ public:
 
 // ZDiscontinuity
 /*! Returns a real giving the distance between and Interface0D and the shape that lies behind (occludee).
- *  This distance is evaluated in the camera space and normalized between 0 and 1. Therefore, if no oject is occluded
+ *  This distance is evaluated in the camera space and normalized between 0 and 1. Therefore, if no object is occluded
  *  by the shape to which the Interface0D belongs to, 1 is returned.
  */
 class LIB_VIEW_MAP_EXPORT ZDiscontinuityF0D : public UnaryFunction0D<real>
@@ -383,7 +383,7 @@ public:
 /*! Returns the material of the object evaluated at the Interface0D.
  *  This evaluation can be ambiguous (in the case of a TVertex for example.
  *  This functor tries to remove this ambiguity using the context offered by the 1D element to which the
- *  Interface0DIterator& belongs to and by arbitrary chosing the material of the face that lies on its left when
+ *  Interface0DIterator& belongs to and by arbitrary choosing the material of the face that lies on its left when
  *  following the 1D element if there are two different materials on each side of the point.
  *  However, there still can be problematic cases, and the user willing to deal with this cases in a specific way
  *  should implement its own getMaterial functor.
diff --git a/source/blender/freestyle/intern/view_map/Functions1D.h b/source/blender/freestyle/intern/view_map/Functions1D.h
index 2d3da151d13..7b10d1b5185 100644
--- a/source/blender/freestyle/intern/view_map/Functions1D.h
+++ b/source/blender/freestyle/intern/view_map/Functions1D.h
@@ -377,7 +377,7 @@ public:
 
 // ZDiscontinuityF1D
 /*! Returns a real giving the distance between and Interface1D and the shape that lies behind (occludee).
- *  This distance is evaluated in the camera space and normalized between 0 and 1. Therefore, if no oject is occluded
+ *  This distance is evaluated in the camera space and normalized between 0 and 1. Therefore, if no object is occluded
  *  by the shape to which the Interface1D belongs to, 1 is returned.
  */
 class LIB_VIEW_MAP_EXPORT ZDiscontinuityF1D : public UnaryFunction1D<real>
diff --git a/source/blender/freestyle/intern/view_map/SteerableViewMap.h b/source/blender/freestyle/intern/view_map/SteerableViewMap.h
index 23681b43c48..581155fa6e8 100644
--- a/source/blender/freestyle/intern/view_map/SteerableViewMap.h
+++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.h
@@ -89,7 +89,7 @@ public:
 
 	/*! Returns the number of the SVM to which a FEdge belongs most.
 	 *  \param id
-	 *    The First element of the Id struct of the FEdge we're intersted in.
+	 *    The First element of the Id struct of the FEdge we're interested in.
 	 */
 	unsigned getSVMNumber(unsigned id);
 
diff --git a/source/blender/freestyle/intern/view_map/ViewMap.h b/source/blender/freestyle/intern/view_map/ViewMap.h
index 987a5bda9b3..0ab089b7d7a 100644
--- a/source/blender/freestyle/intern/view_map/ViewMap.h
+++ b/source/blender/freestyle/intern/view_map/ViewMap.h
@@ -888,7 +888,7 @@ template<class Traits> class vertex_iterator_base;
 
 } // end of namespace ViewEdgeInternal
 
-/*! Class defining a ViewEdge. A ViewEdge in an edge of the image graph. it connnects two ViewVertex.
+/*! Class defining a ViewEdge. A ViewEdge in an edge of the image graph. it connects two ViewVertex.
  *  It is made by connecting a set of FEdges.
  */
 class LIB_VIEW_MAP_EXPORT ViewEdge : public Interface1D