[Bf-blender-cvs] [24947f3a022] soc-2020-soft-body: weights work

[over0219]

Commit: 24947f3a0226615d91ac7c6c88d466e8d6983cf7
Author: over0219
Date:   Thu Jul 9 14:57:10 2020 -0500
Branches: soc-2020-soft-body
https://developer.blender.org/rB24947f3a0226615d91ac7c6c88d466e8d6983cf7

weights work

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

M	extern/softbody/src/admmpd_solver.cpp
M	source/blender/blenkernel/intern/softbody.c

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

diff --git a/extern/softbody/src/admmpd_solver.cpp b/extern/softbody/src/admmpd_solver.cpp
index e1408b4d53e..922f6a58612 100644
--- a/extern/softbody/src/admmpd_solver.cpp
+++ b/extern/softbody/src/admmpd_solver.cpp
@@ -141,7 +141,7 @@ void Solver::init_solve(
 		else
 		{
 			// Scale stiffness by A diagonal max
-			double pin_k_scale = std::sqrt(data->A_diag_max);
+			double pin_k_scale = data->A_diag_max;
 			int np = q_coeffs.size();
 			RowSparseMatrix<double> P(np, nx*3);
 			P.setFromTriplets(trips.begin(), trips.end());
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c
index eefe1bc2a0e..51d4fec7140 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -3734,9 +3734,9 @@ static void admmpd_update_goal_positions(Object *ob, float (*vertexCos)[3])
   int defgroup_index = me->dvert ? (sb->vertgroup - 1) : -1;
 
   for (int i=0; i<nv; i++) {
-    goal_k[i] = 0.7; // softbody default
+    goal_k[i] = 0.1;
     if ((ob->softflag & OB_SB_GOAL) && (defgroup_index != -1)) {
-      goal_k[i] *= BKE_defvert_find_weight(&me->dvert[i], defgroup_index);
+      goal_k[i] = BKE_defvert_find_weight(&me->dvert[i], defgroup_index);
     }
 
     float vi[3];