Merge branch 'master' into blender2.8

2 files changed, 30 insertions, 30 deletions

diff --git a/source/blender/freestyle/intern/scene_graph/FrsMaterial.h b/source/blender/freestyle/intern/scene_graph/FrsMaterial.h
index 220c966a5d0..48b0aabffb6 100644
--- a/source/blender/freestyle/intern/scene_graph/FrsMaterial.h
+++ b/source/blender/freestyle/intern/scene_graph/FrsMaterial.h
@@ -45,19 +45,19 @@ public:
 
 	/*! Builds a Material from its line, diffuse, ambiant, specular, emissive
 	 *  colors, a shininess coefficient and line color priority.
-	 *    \param iLine
+	 *    \param iLine:
 	 *      A 4 element float-array containing the line color.
-	 *    \param iDiffuse
+	 *    \param iDiffuse:
 	 *      A 4 element float-array containing the diffuse color.
-	 *    \param iAmbiant
+	 *    \param iAmbiant:
 	 *      A 4 element float-array containing the ambiant color.
-	 *    \param iSpecular
+	 *    \param iSpecular:
 	 *      A 4 element float-array containing the specular color.
-	 *    \param iEmission
+	 *    \param iEmission:
 	 *      A 4 element float-array containing the emissive color.
-	 *    \param iShininess
+	 *    \param iShininess:
 	 *      The shininess coefficient.
-	 *    \param iPriority
+	 *    \param iPriority:
 	 *      The line color priority.
 	 */
 	inline FrsMaterial(const float *iLine, const float *iDiffuse, const float *iAmbiant, const float *iSpecular,
@@ -232,73 +232,73 @@ public:
 	}
 
 	/*! Sets the line color.
-	 *    \param r
+	 *    \param r:
 	 *      Red component
-	 *    \param g
+	 *    \param g:
 	 *      Green component
-	 *    \param b
+	 *    \param b:
 	 *     Blue component
-	 *    \param a
+	 *    \param a:
 	 *      Alpha component
 	 */
 	inline void setLine(const float r, const float g, const float b, const float a);
 
 	/*! Sets the diffuse color.
-	 *    \param r
+	 *    \param r:
 	 *      Red component
-	 *    \param g
+	 *    \param g:
 	 *      Green component
-	 *    \param b
+	 *    \param b:
 	 *     Blue component
-	 *    \param a
+	 *    \param a:
 	 *      Alpha component
 	 */
 	inline void setDiffuse(const float r, const float g, const float b, const float a);
 
 	/*! Sets the specular color.
-	 *    \param r
+	 *    \param r:
 	 *      Red component
-	 *    \param g
+	 *    \param g:
 	 *      Green component
-	 *    \param b
+	 *    \param b:
 	 *     Blue component
-	 *    \param a
+	 *    \param a:
 	 *      Alpha component
 	 */
 	inline void setSpecular(const float r, const float g, const float b, const float a);
 
 	/*! Sets the ambiant color.
-	 *    \param r
+	 *    \param r:
 	 *      Red component
-	 *    \param g
+	 *    \param g:
 	 *      Green component
-	 *    \param b
+	 *    \param b:
 	 *     Blue component
-	 *    \param a
+	 *    \param a:
 	 *      Alpha component
 	 */
 	inline void setAmbient(const float r, const float g, const float b, const float a);
 
 	/*! Sets the emissive color.
-	 *    \param r
+	 *    \param r:
 	 *      Red component
-	 *    \param g
+	 *    \param g:
 	 *      Green component
-	 *    \param b
+	 *    \param b:
 	 *     Blue component
-	 *    \param a
+	 *    \param a:
 	 *      Alpha component
 	 */
 	inline void setEmission(const float r, const float g, const float b, const float a);
 
 	/*! Sets the shininess.
-	 *    \param s
+	 *    \param s:
 	 *      Shininess
 	 */
 	inline void setShininess(const float s);
 
 	/*! Sets the line color priority.
-	 *    \param priority
+	 *    \param priority:
 	 *      Priority
 	 */
 	inline void setPriority(const int priority);
diff --git a/source/blender/freestyle/intern/scene_graph/NodeCamera.h b/source/blender/freestyle/intern/scene_graph/NodeCamera.h
index 2fc6a00f955..b5021671873 100644
--- a/source/blender/freestyle/intern/scene_graph/NodeCamera.h
+++ b/source/blender/freestyle/intern/scene_graph/NodeCamera.h
@@ -181,7 +181,7 @@ public:
 	 *    |                             zNear-zFar       zNear-zFar     |
 	 *    |                                                             |
 	 *    (   0               0             -1               0          )
-	 *  \param fovy
+	 *  \param fovy:
 	 *    Field of View specified in radians.
 	 */
 	NodePerspectiveCamera(double fovy, double aspect, double zNear, double zFar);