diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-05-16 01:48:02 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-05-17 22:39:16 +0300 |
commit | 21fddf7d1c0653881773e44cea6e9d0804a08b31 (patch) | |
tree | cf3179fce0393c9cc2577d546db790d5f7705694 /source/blender/editors/mesh | |
parent | 2b73402547a7c765f302a0d4218f96b5a710e96f (diff) |
C99/C++11: replace deprecated finite() by isfinite().
Diffstat (limited to 'source/blender/editors/mesh')
-rw-r--r-- | source/blender/editors/mesh/editmesh_rip.c | 4 | ||||
-rw-r--r-- | source/blender/editors/mesh/meshtools.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/mesh/editmesh_rip.c b/source/blender/editors/mesh/editmesh_rip.c index c7a7828f3b2..9e71e646b1a 100644 --- a/source/blender/editors/mesh/editmesh_rip.c +++ b/source/blender/editors/mesh/editmesh_rip.c @@ -77,14 +77,14 @@ static float edbm_rip_edgedist_squared( const float dist_2d = len_v2v2(vec1, vec2); if (dist_2d > FLT_EPSILON) { const float dist = inset / dist_2d; - BLI_assert(finite(dist)); + BLI_assert(isfinite(dist)); interp_v2_v2v2(vec1, vec1, vec2, dist); interp_v2_v2v2(vec2, vec2, vec1, dist); } } dist_sq = dist_squared_to_line_segment_v2(mvalf, vec1, vec2); - BLI_assert(finite(dist_sq)); + BLI_assert(isfinite(dist_sq)); return dist_sq; } diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index 90676d2b951..1b2d4b7c130 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -811,9 +811,9 @@ static BMVert *editbmesh_get_x_mirror_vert_spatial(Object *ob, BMEditMesh *em, c int i; /* ignore nan verts */ - if ((finite(co[0]) == false) || - (finite(co[1]) == false) || - (finite(co[2]) == false)) + if ((isfinite(co[0]) == false) || + (isfinite(co[1]) == false) || + (isfinite(co[2]) == false)) { return NULL; } @@ -902,8 +902,8 @@ static float *editmesh_get_mirror_uv(BMEditMesh *em, int axis, float *uv, float float cent[2]; /* ignore nan verts */ - if (isnan(uv[0]) || !finite(uv[0]) || - isnan(uv[1]) || !finite(uv[1]) + if (isnan(uv[0]) || !isfinite(uv[0]) || + isnan(uv[1]) || !isfinite(uv[1]) ) { return NULL; |