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

Lukas Tönne noreply at git.blender.org
Fri Sep 12 15:50:10 CEST 2014


Commit: 9bae16453c8554b03726f8fa2276ad4fab8093c0
Author: Lukas Tönne
Date:   Fri Sep 12 15:48:59 2014 +0200
Branches: hair_immediate_fixes
https://developer.blender.org/rB9bae16453c8554b03726f8fa2276ad4fab8093c0

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 0170f63..49dc6dd 100644
--- a/source/blender/blenkernel/intern/implicit.c
+++ b/source/blender/blenkernel/intern/implicit.c
@@ -2624,10 +2624,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