[Bf-blender-cvs] [8691aaa] temp_merge_gooseberry_hair: Added a comment and use the new CG solver as the "official" version now.

[Lukas Tönne]

Commit: 8691aaa0d88c5185df98ecbd91850fe6ed7baaae
Author: Lukas Tönne
Date:   Thu Sep 4 09:26:40 2014 +0200
Branches: temp_merge_gooseberry_hair
https://developer.blender.org/rB8691aaa0d88c5185df98ecbd91850fe6ed7baaae

Added a comment and use the new CG solver as the "official" version now.

===================================================================

M	source/blender/blenkernel/intern/implicit.c

===================================================================

diff --git a/source/blender/blenkernel/intern/implicit.c b/source/blender/blenkernel/intern/implicit.c
index 689a0f7..25f36e8 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