Merge branch 'master' into blender2.8

1 files changed, 6 insertions, 6 deletions

diff --git a/source/blender/physics/intern/ConstrainedConjugateGradient.h b/source/blender/physics/intern/ConstrainedConjugateGradient.h
index 8d8dc1ae187..bf4fa2870c0 100644
--- a/source/blender/physics/intern/ConstrainedConjugateGradient.h
+++ b/source/blender/physics/intern/ConstrainedConjugateGradient.h
@@ -9,13 +9,13 @@ namespace Eigen {
 namespace internal {
 
 /** \internal Low-level conjugate gradient algorithm
-  * \param mat The matrix A
-  * \param rhs The right hand side vector b
-  * \param x On input and initial solution, on output the computed solution.
-  * \param precond A preconditioner being able to efficiently solve for an
+  * \param mat: The matrix A
+  * \param rhs: The right hand side vector b
+  * \param x: On input and initial solution, on output the computed solution.
+  * \param precond: A preconditioner being able to efficiently solve for an
   *                approximation of Ax=b (regardless of b)
-  * \param iters On input the max number of iteration, on output the number of performed iterations.
-  * \param tol_error On input the tolerance error, on output an estimation of the relative error.
+  * \param iters: On input the max number of iteration, on output the number of performed iterations.
+  * \param tol_error: On input the tolerance error, on output an estimation of the relative error.
   */
 template<typename MatrixType, typename Rhs, typename Dest, typename FilterMatrixType, typename Preconditioner>
 EIGEN_DONT_INLINE