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
path: root/source
diff options
context:
space:
mode:
authorHans Goudey <h.goudey@me.com>2020-08-13 17:05:20 +0300
committerHans Goudey <h.goudey@me.com>2020-08-13 17:05:20 +0300
commit52e7d0bebe5703ce1b9b0e79a20eba9aaef0d1b9 (patch)
treee3f82a7cd90a50865e72e7a1d1e360678066b4d9 /source
parentf66fc94da6865908a180e08d518947eda5f5ab8a (diff)
parent4e103101f7a20eaa2a61306a1070a04b63a69958 (diff)
Merge branch 'blender-v2.90-release'
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/softbody.c3
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);
+ }
}
}