[Bf-blender-cvs] [f36974123b1] soc-2021-simulation-display: Merge branch 'master' into soc-2021-simulation-display

[soumya pochiraju]

Commit: f36974123b1693c29f2014f314d517b75bbf2da0
Author: soumya pochiraju
Date:   Sun Jun 27 20:27:50 2021 +0530
Branches: soc-2021-simulation-display
https://developer.blender.org/rBf36974123b1693c29f2014f314d517b75bbf2da0

Merge branch 'master' into soc-2021-simulation-display

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



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

diff --cc source/blender/blenkernel/intern/softbody.c
index 2cb0cd85207,123843c88db..bf8c9d60e0a
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@@ -2111,10 -2111,9 +2111,10 @@@ static int _softbody_calc_forces_slice_
          float eval_sb_fric_force_scale = sb_fric_force_scale(ob);
  
          pd_point_from_soft(scene, bp->pos, bp->vec, sb->bpoint - bp, &epoint);
 -        BKE_effectors_apply(effectors, NULL, sb->effector_weights, &epoint, force, NULL, speed);
 +        BKE_effectors_apply(
 +            effectors, NULL, sb->effector_weights, &epoint, force, NULL, speed, NULL);
  
-         /* apply forcefield*/
+         /* Apply force-field. */
          mul_v3_fl(force, fieldfactor * eval_sb_fric_force_scale);
          add_v3_v3(bp->force, force);