diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-04-14 03:30:14 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-04-14 03:34:32 +0300 |
| commit | c448196bb4c99b13cdaaf0e197a9f44a46b3bc18 (patch) | |
| tree | 3461665d470b8be77c70adcb957ef4fbe86b5d28 /source/blender/physics | |
| parent | af2f4724d57ac11d45e22db97fa797676c44d091 (diff) | |
Cleanup: warnings
Diffstat (limited to 'source/blender/physics')
| -rw-r--r-- | source/blender/physics/intern/BPH_mass_spring.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/physics/intern/BPH_mass_spring.cpp b/source/blender/physics/intern/BPH_mass_spring.cpp index e0ca945eaf7..9f6050527ef 100644 --- a/source/blender/physics/intern/BPH_mass_spring.cpp +++ b/source/blender/physics/intern/BPH_mass_spring.cpp @@ -140,7 +140,7 @@ static bool collision_response(ClothModifierData *clmd, CollisionModifierData *c float v1[3], v2_old[3], v2_new[3], v_rel_old[3], v_rel_new[3];
float epsilon2 = BLI_bvhtree_getepsilon(collmd->bvhtree);
- float margin_distance = collpair->distance - epsilon2;
+ float margin_distance = (float)collpair->distance - epsilon2;
float mag_v_rel;
zero_v3(r_impulse);
|