diff options
| author | over0219 <over0219@umn.edu> | 2020-07-09 22:57:10 +0300 |
|---|---|---|
| committer | over0219 <over0219@umn.edu> | 2020-07-09 22:57:10 +0300 |
| commit | 24947f3a0226615d91ac7c6c88d466e8d6983cf7 (patch) | |
| tree | 5126eea53340ba0d891bdb54cdc0fc9434b33861 | |
| parent | 14a76718e5e0d16c87e45f27f20a31aebe1e19e6 (diff) | |
weights work
| -rw-r--r-- | extern/softbody/src/admmpd_solver.cpp | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/softbody.c | 4 |
2 files changed, 3 insertions, 3 deletions
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]; |