Cleanup: double-promotion warnings

2015-07-25 13:26:20 +10:00
parent 2a286829f7
commit e301cf3ec2
8 changed files with 12 additions and 10 deletions
--- a/source/blender/bmesh/operators/bmo_join_triangles.c
+++ b/source/blender/bmesh/operators/bmo_join_triangles.c
@@ -105,7 +105,7 @@ static float quad_calc_error(
 		area_min = min_ff(area_a, area_b);
 		area_max = max_ff(area_a, area_b);

-		diff = area_max ? (1.0 - (area_min / area_max)) : 1.0f;
+		diff = area_max ? (1.0f - (area_min / area_max)) : 1.0f;

 		error += diff;
 	}