[Bf-blender-cvs] [f318106] temp_merge_gooseberry_hair: Revert "Ignore velocity changes when the cloth solver does not converge."

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


Commit: f318106df539a02468cfbcb8bfdfd5f76c752869
Author: Lukas Tönne
Date:   Fri Sep 12 15:48:59 2014 +0200
Branches: temp_merge_gooseberry_hair
https://developer.blender.org/rBf318106df539a02468cfbcb8bfdfd5f76c752869

Revert "Ignore velocity changes when the cloth solver does not converge."

This reverts commit c52b8ae818844965d56714a71255408873275dc1.

Sadly, at this point solver convergence is an exception rather than the
rule... Individual hairs can "explode" easily and thus disable the whole
simulation, which isn't helpful either.

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

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

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

diff --git a/source/blender/blenkernel/intern/implicit.c b/source/blender/blenkernel/intern/implicit.c
index 54fb7e2..f60a0cc 100644
--- a/source/blender/blenkernel/intern/implicit.c
+++ b/source/blender/blenkernel/intern/implicit.c
@@ -2430,10 +2430,8 @@ static bool simulate_implicit_euler(Implicit_Data *id, float dt)
 	// itend();
 	// printf("cg_filtered calc time: %f\n", (float)itval());
 
-	if (ok) {
-		// advance velocities
-		add_lfvector_lfvector(id->Vnew, id->V, id->dV, numverts);
-	}
+	// advance velocities
+	add_lfvector_lfvector(id->Vnew, id->V, id->dV, numverts);
 
 	del_lfvector(dFdXmV);




More information about the Bf-blender-cvs mailing list