diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-05 06:30:30 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-05 06:30:30 +0400 |
| commit | d0412a1981266064aab38ca47f5d72ef9192e783 (patch) | |
| tree | 754a541f99f511cb65c66256b7a8dca7d2673279 /source/blender/blenkernel/intern/cloth.c | |
| parent | 936af71e9755d1f1aab05576dabb7eea73a962c2 (diff) | |
| parent | 4acab3eb33db20eef89d0159199429c690b0f2df (diff) | |
svn merge ^/trunk/blender -r43864:43887
Diffstat (limited to 'source/blender/blenkernel/intern/cloth.c')
| -rw-r--r-- | source/blender/blenkernel/intern/cloth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c index ca0898a7085..e2d12c04bf2 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -1152,7 +1152,7 @@ static int cloth_build_springs ( ClothModifierData *clmd, DerivedMesh *dm ) spring->kl = MAX2(mface[i].v4, mface[i].v2); spring->restlen = len_v3v3(cloth->verts[spring->kl].xrest, cloth->verts[spring->ij].xrest); spring->type = CLOTH_SPRING_TYPE_SHEAR; - spring->stiffness = (cloth->verts[spring->kl].shear_stiff + cloth->verts[spring->ij].shear_stiff) / 2.0; + spring->stiffness = (cloth->verts[spring->kl].shear_stiff + cloth->verts[spring->ij].shear_stiff) / 2.0f; BLI_linklist_append ( &edgelist[spring->ij], spring ); BLI_linklist_append ( &edgelist[spring->kl], spring ); |