diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-09-04 11:26:40 +0400 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-01-20 11:29:57 +0300 |
| commit | ae162f61e7d36c34babcfa1e8c4a63050c32b549 (patch) | |
| tree | d2d7bd4adbcdb95569c8d9ade5ea594567f6590b /source/blender/blenkernel/intern/implicit.c | |
| parent | c6e5f6afe0072bebc1fe262e3a671ce2777b382f (diff) | |
Added a comment and use the new CG solver as the "official" version now.
Diffstat (limited to 'source/blender/blenkernel/intern/implicit.c')
| -rw-r--r-- | source/blender/blenkernel/intern/implicit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/implicit.c b/source/blender/blenkernel/intern/implicit.c index 689a0f743f5..25f36e8ee42 100644 --- a/source/blender/blenkernel/intern/implicit.c +++ b/source/blender/blenkernel/intern/implicit.c @@ -761,7 +761,7 @@ DO_INLINE void filter(lfVector *V, fmatrix3x3 *S) } } -#if 0 +#if 0 /* this version of the CG algorithm does not work very well with partial constraints (where S has non-zero elements) */ static int cg_filtered(lfVector *ldV, fmatrix3x3 *lA, lfVector *lB, lfVector *z, fmatrix3x3 *S) { // Solves for unknown X in equation AX=B @@ -826,7 +826,8 @@ static int cg_filtered(lfVector *ldV, fmatrix3x3 *lA, lfVector *lB, lfVector *z return conjgrad_loopcount<conjgrad_looplimit; // true means we reached desired accuracy in given time - ie stable } -#else +#endif + static int cg_filtered(lfVector *ldV, fmatrix3x3 *lA, lfVector *lB, lfVector *z, fmatrix3x3 *S) { // Solves for unknown X in equation AX=B @@ -892,7 +893,6 @@ static int cg_filtered(lfVector *ldV, fmatrix3x3 *lA, lfVector *lB, lfVector *z, return conjgrad_loopcount < conjgrad_looplimit; // true means we reached desired accuracy in given time - ie stable } -#endif #if 0 // block diagonalizer |