diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2020-08-13 17:57:42 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2020-08-13 17:57:42 +0300 |
| commit | 735c717a63c8870d2ef4a910d82a2648cbaaa5e1 (patch) | |
| tree | 4cff1cfe01053b8cc188cc69e1c2c60946fe37cc /source/blender/blenkernel/intern/softbody.c | |
| parent | cba7391d4a42a44efeddae3ff717e542a3c73738 (diff) | |
| parent | 53683dec7d9ac9f324ff91904c9f80b8018b9b9c (diff) | |
Merge branch 'master' into greasepencil-edit-curve
Diffstat (limited to 'source/blender/blenkernel/intern/softbody.c')
| -rw-r--r-- | source/blender/blenkernel/intern/softbody.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 1ab9766a7ec..6a6f74d9fb4 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -2965,6 +2965,9 @@ static void lattice_to_softbody(Scene *scene, Object *ob) if (ob->softflag & OB_SB_EDGES) { makelatticesprings(lt, ob->soft->bspring, ob->softflag & OB_SB_QUADS, ob); build_bps_springlist(ob); /* link bps to springs */ + if (ob->softflag & OB_SB_SELF) { + calculate_collision_balls(ob); + } } } |