[Bf-blender-cvs] [5e28df26de] cloth-improvements: Fix regression on plasticity caused by sewing springs

Luca Rood noreply at git.blender.org
Sat Feb 4 07:00:10 CET 2017


Commit: 5e28df26de23460487a9df454685d5dda9c38080
Author: Luca Rood
Date:   Sat Feb 4 03:57:26 2017 -0200
Branches: cloth-improvements
https://developer.blender.org/rB5e28df26de23460487a9df454685d5dda9c38080

Fix regression on plasticity caused by sewing springs

I must have been sleeping when I committed the fix for the sewing
springs regression, causing another silly regression on plasticity...

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

M	source/blender/physics/intern/implicit_blender.c

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

diff --git a/source/blender/physics/intern/implicit_blender.c b/source/blender/physics/intern/implicit_blender.c
index 502df1c8b4..2d14502d52 100644
--- a/source/blender/physics/intern/implicit_blender.c
+++ b/source/blender/physics/intern/implicit_blender.c
@@ -1788,7 +1788,7 @@ bool BPH_mass_spring_force_spring_angular(Implicit_Data *data, int i, int j, int
 	force = stiffness * (angle - restang);
 
 	/* compute plasticity offset */
-	if (do_plast && (restangorig > 0.0f)) {
+	if (do_plast) {
 		if (angle > restang) {
 			if (angle - restang > yield_ang) {
 				restang += (angle - restang - yield_ang) * plasticity;




More information about the Bf-blender-cvs mailing list