From c448196bb4c99b13cdaaf0e197a9f44a46b3bc18 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 14 Apr 2015 10:30:14 +1000 Subject: Cleanup: warnings --- source/blender/physics/intern/BPH_mass_spring.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/physics') 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); -- cgit v1.2.3