From 50a1ad5bb32fd5705039c992956418cc0d520e33 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 6 Jun 2015 21:02:16 +1000 Subject: Cleanup --- source/blender/blenkernel/intern/smoke.c | 2 +- source/blender/blenlib/intern/path_util.c | 6 +++--- source/blender/bmesh/tools/bmesh_bevel.c | 8 +++++--- source/blender/editors/armature/meshlaplacian.c | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index 770ef4c2493..28a2c42546d 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -267,7 +267,7 @@ static void smoke_set_domain_from_derivedmesh(SmokeDomainSettings *sds, Object * } /* apply object scale */ for (i = 0; i < 3; i++) { - size[i] = fabs(size[i] * ob->size[i]); + size[i] = fabsf(size[i] * ob->size[i]); } copy_v3_v3(sds->global_size, size); copy_v3_v3(sds->dp0, min); diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index d3352e24722..b1a7d74e46f 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -946,7 +946,7 @@ void BLI_path_frame_strip(char *path, bool setsharp, char *ext) c++; - if(numdigits) { + if (numdigits) { /* replace the number with the suffix and terminate the string */ while (numdigits--) { if (ext) *ext++ = *suffix; @@ -1161,8 +1161,8 @@ bool BLI_path_program_extensions_add_win32(char *name, const size_t maxlen) memcpy(filename_ext, ext, ext_len); filename_ext[ext_len] = '\0'; - type = BLI_exists(filename); - if (type && (!S_ISDIR(type))) { + type = BLI_exists(filename); + if (type && (!S_ISDIR(type))) { retval = true; BLI_strncpy(name, filename, maxlen); break; diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index 6a8411dd189..3348afa3bfa 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -801,7 +801,7 @@ static bool offset_meet_edge(EdgeHalf *e1, EdgeHalf *e2, BMVert *v, float meetc /* find angle from dir1 to dir2 as viewed from vertex normal side */ ang = angle_normalized_v3v3(dir1, dir2); - if (fabs(ang) < BEVEL_GOOD_ANGLE) { + if (fabsf(ang) < BEVEL_GOOD_ANGLE) { if (r_angle) *r_angle = 0.0f; return false; @@ -812,7 +812,7 @@ static bool offset_meet_edge(EdgeHalf *e1, EdgeHalf *e2, BMVert *v, float meetc if (r_angle) *r_angle = ang; - if (fabs(ang - (float)M_PI) < BEVEL_GOOD_ANGLE) + if (fabsf(ang - (float)M_PI) < BEVEL_GOOD_ANGLE) return false; sinang = sinf(ang); @@ -1532,8 +1532,10 @@ static bool eh_on_plane(EdgeHalf *e) if (e->fprev && e->fnext) { dot = dot_v3v3(e->fprev->no, e->fnext->no); if (fabsf(dot) <= BEVEL_EPSILON || - fabsf(dot - 1.0f) <= BEVEL_EPSILON) + fabsf(dot - 1.0f) <= BEVEL_EPSILON) + { return true; + } } return false; } diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c index fa774b0744a..c630ea6478a 100644 --- a/source/blender/editors/armature/meshlaplacian.c +++ b/source/blender/editors/armature/meshlaplacian.c @@ -1719,7 +1719,7 @@ static void meshdeform_matrix_solve(MeshDeformModifierData *mmd, MeshDeformBind /* sanity check */ for (b = 0; b < mdb->size3; b++) if (mdb->tag[b] != MESHDEFORM_TAG_EXTERIOR) - if (fabs(mdb->totalphi[b] - 1.0f) > 1e-4) + if (fabsf(mdb->totalphi[b] - 1.0f) > 1e-4f) printf("totalphi deficiency [%s|%d] %d: %.10f\n", (mdb->tag[b] == MESHDEFORM_TAG_INTERIOR) ? "interior" : "boundary", mdb->semibound[b], mdb->varidx[b], mdb->totalphi[b]); #endif -- cgit v1.2.3