Merge branch 'master' into blender2.8
[blender.git] / source / blender / blenkernel / intern / softbody.c
index e3bd6f9860fcf4b8b0478d6ce91f2feceaf3efd7..87687e33f8f6c693bec5c8e99d7bfe2f7f67f91f 100644 (file)
@@ -875,8 +875,9 @@ static void free_scratch(SoftBody *sb)
        if (sb->scratch) {
                /* todo make sure everything is cleaned up nicly */
                if (sb->scratch->colliderhash) {
-                       BLI_ghash_free(sb->scratch->colliderhash, NULL,
-                                       (GHashValFreeFP) ccd_mesh_free); /*this hoepfully will free all caches*/
+                       BLI_ghash_free(
+                               sb->scratch->colliderhash, NULL,
+                               (GHashValFreeFP) ccd_mesh_free); /*this hoepfully will free all caches*/
                        sb->scratch->colliderhash = NULL;
                }
                if (sb->scratch->bodyface) {
@@ -2119,7 +2120,7 @@ static int _softbody_calc_forces_slice_in_a_thread(Scene *scene, Object *ob, flo
                                }/* existing spring list */
                        }/*any edges*/
                        /* ---springs */
-               }/*omit on snap */
+               }/*omit on snap */
        }/*loop all bp's*/
        return 0; /*done fine*/
 }
@@ -2469,7 +2470,7 @@ static void softbody_calc_forces(struct Depsgraph *depsgraph, Scene *scene, Obje
                                        }/* existing spring list */
                                }/*any edges*/
                                /* ---springs */
-                       }/*omit on snap */
+                       }/*omit on snap */
                }/*loop all bp's*/
 
 
@@ -3280,7 +3281,7 @@ SoftBody *sbNew(Scene *scene)
        sb->shared->pointcache = BKE_ptcache_add(&sb->shared->ptcaches);
 
        if (!sb->effector_weights)
-               sb->effector_weights = BKE_add_effector_weights(NULL);
+               sb->effector_weights = BKE_effector_add_weights(NULL);
 
        sb->last_frame= MINFRAME-1;