Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-07-25 06:26:20 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-07-25 06:26:20 +0300
commite301cf3ec2cb8caa544032238cf7a1e7bb5e2523 (patch)
tree8f564a932b1e739eeadd395f69499bf548ed7dfe /source/blender/bmesh/operators/bmo_join_triangles.c
parent2a286829f7fa19ffceb6ec6be095ee11305353e3 (diff)
Cleanup: double-promotion warnings
Diffstat (limited to 'source/blender/bmesh/operators/bmo_join_triangles.c')
-rw-r--r--source/blender/bmesh/operators/bmo_join_triangles.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/bmesh/operators/bmo_join_triangles.c b/source/blender/bmesh/operators/bmo_join_triangles.c
index b873e6bacb3..3718f14276c 100644
--- 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;
}