diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-08-22 14:57:07 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-08-22 14:57:07 +0400 |
| commit | 1e14ab99926a53fc540f3fb1e2a1e57f0ce559cc (patch) | |
| tree | d94d43f7f663638d1294a1069235059490ba93a9 /source/blender/blenkernel | |
| parent | 2aa2512a43781f6ac8937c152398e9de731aef07 (diff) | |
| parent | a4f3f5c23c4201bc885310aa17226d2ee3922a2a (diff) | |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22668:22701
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/softbody.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 68f918b0c68..40a28251495 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -866,7 +866,8 @@ static void renew_softbody(Scene *scene, Object *ob, int totpoint, int totspring bp->frozen = 1.0f; bp->colball = 0.0f; bp->flag = 0; - + bp->springweight = 1.0f; + bp->mass = sb->nodemass; } } } |