[Bf-blender-cvs] [50a1ad5] master: Cleanup

[Campbell Barton]

Commit: 50a1ad5bb32fd5705039c992956418cc0d520e33
Author: Campbell Barton
Date:   Sat Jun 6 21:02:16 2015 +1000
Branches: master
https://developer.blender.org/rB50a1ad5bb32fd5705039c992956418cc0d520e33

Cleanup

===================================================================

M	source/blender/blenkernel/intern/smoke.c
M	source/blender/blenlib/intern/path_util.c
M	source/blender/bmesh/tools/bmesh_bevel.c
M	source/blender/editors/armature/meshlaplacian.c

===================================================================

diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 770ef4c..28a2c42 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 d3352e2..b1a7d74 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 6a8411d..3348afa 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 fa774b0..c630ea6 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