diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-24 18:41:46 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-24 18:42:52 +0300 |
commit | 253dce07d7cccb769d34356fc34c5900f7cd0ec8 (patch) | |
tree | e4018aaa2b89340d7d2e08cdbcba8ea3ff40b0cc /source/blender/physics/intern/ConstrainedConjugateGradient.h | |
parent | fe52a05e950e474036c80f554a4675f12203695b (diff) | |
parent | 0cff044d84646c2890f13b8915eb708861bb36d6 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/physics/intern/ConstrainedConjugateGradient.h')
-rw-r--r-- | source/blender/physics/intern/ConstrainedConjugateGradient.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/physics/intern/ConstrainedConjugateGradient.h b/source/blender/physics/intern/ConstrainedConjugateGradient.h index 2d5fb41cc73..8d8dc1ae187 100644 --- a/source/blender/physics/intern/ConstrainedConjugateGradient.h +++ b/source/blender/physics/intern/ConstrainedConjugateGradient.h @@ -175,7 +175,7 @@ struct traits<ConstrainedConjugateGradient<_MatrixType,_UpLo,_FilterMatrixType,_ * ++i; * } while (cg.info()!=Success && i<100); * \endcode - * Note that such a step by step excution is slightly slower. + * Note that such a step by step execution is slightly slower. * * \sa class SimplicialCholesky, DiagonalPreconditioner, IdentityPreconditioner */ |