diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-07-25 06:26:20 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-07-25 06:26:20 +0300 |
| commit | e301cf3ec2cb8caa544032238cf7a1e7bb5e2523 (patch) | |
| tree | 8f564a932b1e739eeadd395f69499bf548ed7dfe /source/blender/bmesh | |
| parent | 2a286829f7fa19ffceb6ec6be095ee11305353e3 (diff) | |
Cleanup: double-promotion warnings
Diffstat (limited to 'source/blender/bmesh')
4 files changed, 4 insertions, 4 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; } diff --git a/source/blender/bmesh/operators/bmo_subdivide.c b/source/blender/bmesh/operators/bmo_subdivide.c index e3304298647..45e3c8d193d 100644 --- a/source/blender/bmesh/operators/bmo_subdivide.c +++ b/source/blender/bmesh/operators/bmo_subdivide.c @@ -184,7 +184,7 @@ static void alter_co( float fac, len, val; sub_v3_v3v3(dir, v_a->co, v_b->co); - len = M_SQRT1_2 * normalize_v3(dir); + len = (float)M_SQRT1_2 * normalize_v3(dir); /* cosine angle */ fac = dot_v3v3(dir, v_a->no); diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index 308c187048a..b47f56d1cb4 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -758,7 +758,7 @@ static void offset_meet(EdgeHalf *e1, EdgeHalf *e2, BMVert *v, BMFace *f, bool e copy_v3_v3(meetco, closer_v->co); e1->offset_r = len_v3v3(meetco, v->co); } - if (edges_between && e1->offset_r > 0.0 && e2->offset_l > 0.0) { + if (edges_between && e1->offset_r > 0.0f && e2->offset_l > 0.0f) { /* Try to drop meetco to a face between e1 and e2 */ if (isect_kind == 2) { /* lines didn't meet in 3d: get average of meetco and isect2 */ diff --git a/source/blender/bmesh/tools/bmesh_decimate_collapse.c b/source/blender/bmesh/tools/bmesh_decimate_collapse.c index c3533245d9b..43a34331fc2 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_collapse.c +++ b/source/blender/bmesh/tools/bmesh_decimate_collapse.c @@ -111,7 +111,7 @@ static void bm_decim_build_quadrics(BMesh *bm, Quadric *vquadrics) cross_v3_v3v3(edge_plane, edge_vector, f->no); copy_v3db_v3fl(edge_plane_db, edge_plane); - if (normalize_v3_d(edge_plane_db) > FLT_EPSILON) { + if (normalize_v3_d(edge_plane_db) > (double)FLT_EPSILON) { Quadric q; float center[3]; |