[Bf-blender-cvs] [289a6f9] temp_merge_gooseberry_hair: Use squareroot of the current epsilon error target for CG, since we square this value anyway.

Lukas Tönne noreply at git.blender.org
Mon Jan 19 20:48:13 CET 2015


Commit: 289a6f931ad30da1b45dfd9be1870804da7c2879
Author: Lukas Tönne
Date:   Thu Sep 4 19:57:21 2014 +0200
Branches: temp_merge_gooseberry_hair
https://developer.blender.org/rB289a6f931ad30da1b45dfd9be1870804da7c2879

Use squareroot of the current epsilon error target for CG, since we
square this value anyway.

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

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

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

diff --git a/source/blender/blenkernel/intern/implicit.c b/source/blender/blenkernel/intern/implicit.c
index 6e0a9d7..0d4a7ec 100644
--- a/source/blender/blenkernel/intern/implicit.c
+++ b/source/blender/blenkernel/intern/implicit.c
@@ -839,7 +839,7 @@ static int cg_filtered(lfVector *ldV, fmatrix3x3 *lA, lfVector *lB, lfVector *z,
 {
 	// Solves for unknown X in equation AX=B
 	unsigned int conjgrad_loopcount=0, conjgrad_looplimit=100;
-	float conjgrad_epsilon=0.0001f /* , conjgrad_lasterror=0 */ /* UNUSED */;
+	float conjgrad_epsilon=0.01f;
 	
 	unsigned int numverts = lA[0].vcount;
 	lfVector *fB = create_lfvector(numverts);




More information about the Bf-blender-cvs mailing list