Merge branch 'master' into blender2.8

9 files changed, 10 insertions, 10 deletions

diff --git a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h
index 16dea6f907e..c1a5b2a6774 100644
--- a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h
+++ b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h
@@ -90,7 +90,7 @@ public:
 	 *        - TRIANGLES     : the face indices describe single triangles
 	 *      If iCopy != 0, the array is copied; you must desallocate iFaceStyle. Else you must not.
 	 *    iVIndices,
-	 *      Array of vertices indices. 
+	 *      Array of vertices indices.
 	 *      The integers contained in this array must be multiple of 3.
 	 *      If iCopy != 0, the array is copied; you must desallocate iVIndices. Else you must not.
 	 *    iVISize
diff --git a/source/blender/freestyle/intern/scene_graph/LineRep.cpp b/source/blender/freestyle/intern/scene_graph/LineRep.cpp
index e7d81113974..a35920a4f4c 100644
--- a/source/blender/freestyle/intern/scene_graph/LineRep.cpp
+++ b/source/blender/freestyle/intern/scene_graph/LineRep.cpp
@@ -39,7 +39,7 @@ void LineRep::ComputeBBox()
 	real YMin = _vertices.front()[1];
 	real ZMin = _vertices.front()[2];
 
-	// parse all the coordinates to find 
+	// parse all the coordinates to find
 	// the XMax, YMax, ZMax
 	vector<Vec3r>::iterator v;
 	for (v = _vertices.begin(); v != _vertices.end(); ++v) {
diff --git a/source/blender/freestyle/intern/scene_graph/Node.h b/source/blender/freestyle/intern/scene_graph/Node.h
index 546458bad48..4ddcadd3542 100644
--- a/source/blender/freestyle/intern/scene_graph/Node.h
+++ b/source/blender/freestyle/intern/scene_graph/Node.h
@@ -104,7 +104,7 @@ public:
 
 protected:
 
-private: 
+private:
 	BBox<Vec3r> _BBox;
 
 #ifdef WITH_CXX_GUARDEDALLOC
diff --git a/source/blender/freestyle/intern/scene_graph/NodeCamera.h b/source/blender/freestyle/intern/scene_graph/NodeCamera.h
index 78c34fdef6d..c2f70d514a8 100644
--- a/source/blender/freestyle/intern/scene_graph/NodeCamera.h
+++ b/source/blender/freestyle/intern/scene_graph/NodeCamera.h
@@ -52,7 +52,7 @@ public:
 	} CameraType;
 
 	/*! Default matrices: Identity for both projection and modelview. */
-	NodeCamera(CameraType camera_type = GENERIC); 
+	NodeCamera(CameraType camera_type = GENERIC);
 #if 0  /* UNUSED, gives warning in gcc */
 	NodeCamera(const NodeCamera& iBrother);
 #endif
diff --git a/source/blender/freestyle/intern/scene_graph/NodeGroup.h b/source/blender/freestyle/intern/scene_graph/NodeGroup.h
index 69c8a2c8f3b..e8e58b0915e 100644
--- a/source/blender/freestyle/intern/scene_graph/NodeGroup.h
+++ b/source/blender/freestyle/intern/scene_graph/NodeGroup.h
@@ -48,7 +48,7 @@ public:
 	/*! Adds a child. Makes a addRef on the iChild reference counter */
 	virtual void AddChild(Node *iChild);
 
-	/*! destroys all the underlying nodes 
+	/*! destroys all the underlying nodes
 	 *  Returns the reference counter after having done a release()
 	 */
 	virtual int destroy();
diff --git a/source/blender/freestyle/intern/scene_graph/NodeLight.cpp b/source/blender/freestyle/intern/scene_graph/NodeLight.cpp
index 5a54bc09891..9e15f6c1eee 100644
--- a/source/blender/freestyle/intern/scene_graph/NodeLight.cpp
+++ b/source/blender/freestyle/intern/scene_graph/NodeLight.cpp
@@ -37,7 +37,7 @@ NodeLight::NodeLight() : Node()
 		_number = 7;
 	}
 	else {
-		_number = numberOfLights; 
+		_number = numberOfLights;
 		numberOfLights++;
 	}
 
@@ -61,7 +61,7 @@ NodeLight::NodeLight(NodeLight& iBrother) : Node(iBrother)
 		_number = 7;
 	}
 	else {
-		_number = numberOfLights; 
+		_number = numberOfLights;
 		numberOfLights++;
 	}
 
diff --git a/source/blender/freestyle/intern/scene_graph/NodeLight.h b/source/blender/freestyle/intern/scene_graph/NodeLight.h
index c633a6bc7b8..10d6f657872 100644
--- a/source/blender/freestyle/intern/scene_graph/NodeLight.h
+++ b/source/blender/freestyle/intern/scene_graph/NodeLight.h
@@ -41,7 +41,7 @@ using namespace Geometry;
 class NodeLight : public Node
 {
 public:
-	NodeLight(); 
+	NodeLight();
 	NodeLight(NodeLight& iBrother);
 
 	virtual ~NodeLight() {}
diff --git a/source/blender/freestyle/intern/scene_graph/Rep.h b/source/blender/freestyle/intern/scene_graph/Rep.h
index 773eb2d3278..4c8017e162d 100644
--- a/source/blender/freestyle/intern/scene_graph/Rep.h
+++ b/source/blender/freestyle/intern/scene_graph/Rep.h
@@ -97,7 +97,7 @@ public:
 		return *this;
 	}
 
-	virtual ~Rep() 
+	virtual ~Rep()
 	{
 		if (0 != _FrsMaterial) {
 			delete _FrsMaterial;
diff --git a/source/blender/freestyle/intern/scene_graph/TriangleRep.h b/source/blender/freestyle/intern/scene_graph/TriangleRep.h
index d101cfd7988..353555b2802 100644
--- a/source/blender/freestyle/intern/scene_graph/TriangleRep.h
+++ b/source/blender/freestyle/intern/scene_graph/TriangleRep.h
@@ -28,7 +28,7 @@
  *  \date 16/12/2002
  */
 
-//! inherits from class Rep 
+//! inherits from class Rep
 #include "Rep.h"
 
 namespace Freestyle {