Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-08-14 16:29:46 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-08-14 16:32:24 +0300
commit03b2371387dcae9f801cabbc1819b1d7e3350829 (patch)
tree0300655f20a06a8e5c807b5fe6263b47c686dedb /source/blender/blenkernel/intern/softbody.c
parentbc4fe45aef7e52f9e7a2bd5e370c6791c58af832 (diff)
Cleanup: move trailing comments to avoid wrapping code
Some statements were split across multiple lines because of their trailing comments. In most cases it's clearer to put the comments above.
Diffstat (limited to 'source/blender/blenkernel/intern/softbody.c')
-rw-r--r--source/blender/blenkernel/intern/softbody.c22
1 files changed, 14 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c
index 2024a507ebb..20736e28a53 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -1731,8 +1731,8 @@ static int sb_detect_vertex_collisionCached(float opco[3],
/* switch origin to be nv2*/
sub_v3_v3v3(edge1, nv1, nv2);
sub_v3_v3v3(edge2, nv3, nv2);
- sub_v3_v3v3(
- dv1, opco, nv2); /* abuse dv1 to have vertex in question at *origin* of triangle */
+ /* Abuse dv1 to have vertex in question at *origin* of triangle. */
+ sub_v3_v3v3(dv1, opco, nv2);
cross_v3_v3v3(d_nvect, edge2, edge1);
/* n_mag = */ /* UNUSED */ normalize_v3(d_nvect);
@@ -2087,9 +2087,12 @@ static int _softbody_calc_forces_slice_in_a_thread(Scene *scene,
if (scene->physics_settings.flag & PHYS_GLOBAL_GRAVITY) {
float gravity[3];
copy_v3_v3(gravity, scene->physics_settings.gravity);
+
+ /* Individual mass of node here. */
mul_v3_fl(gravity,
sb_grav_force_scale(ob) * _final_mass(ob, bp) *
- sb->effector_weights->global_gravity); /* individual mass of node here */
+ sb->effector_weights->global_gravity);
+
add_v3_v3(bp->force, gravity);
}
@@ -2099,8 +2102,10 @@ static int _softbody_calc_forces_slice_in_a_thread(Scene *scene,
float kd;
float force[3] = {0.0f, 0.0f, 0.0f};
float speed[3] = {0.0f, 0.0f, 0.0f};
- float eval_sb_fric_force_scale = sb_fric_force_scale(
- ob); /* just for calling function once */
+
+ /* just for calling function once */
+ 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, speed);
@@ -2743,9 +2748,10 @@ static void mesh_to_softbody(Scene *scene, Object *ob)
build_bps_springlist(ob); /* scan for springs attached to bodypoints ONCE */
/* insert *other second order* springs if desired */
if (sb->secondspring > 0.0000001f) {
- add_2nd_order_springs(
- ob, sb->secondspring); /* exploits the first run of build_bps_springlist(ob);*/
- build_bps_springlist(ob); /* yes we need to do it again*/
+ /* exploits the first run of build_bps_springlist(ob); */
+ add_2nd_order_springs(ob, sb->secondspring);
+ /* yes we need to do it again. */
+ build_bps_springlist(ob);
}
springs_from_mesh(ob); /* write the 'rest'-length of the springs */
if (ob->softflag & OB_SB_SELF) {