Commit: ac38f2584f1c08d5f9db9f4fbd71f8845885c6d1
Author: Campbell Barton
Date: Sun Dec 1 13:11:12 2013 +1100
http://developer.blender.org/rBac38f2584f1c08d5f9db9f4fbd71f8845885c6d1
Code Cleanup: replace ABS() with fabsf() when used with float expressions.
===================================================================
M source/blender/blenkernel/intern/implicit.c
M source/blender/blenkernel/intern/mesh.c
M source/blender/editors/animation/anim_markers.c
M source/blender/editors/interface/interface_widgets.c
M source/blender/editors/screen/glutil.c
M source/blender/editors/space_node/drawnode.c
M source/blender/editors/transform/transform_snap.c
===================================================================
diff --git a/source/blender/blenkernel/intern/implicit.c
b/source/blender/blenkernel/intern/implicit.c
index c8e18bc..fce6ed9 100644
--- a/source/blender/blenkernel/intern/implicit.c
+++ b/source/blender/blenkernel/intern/implicit.c
@@ -1265,7 +1265,7 @@ DO_INLINE void cloth_calc_spring_force(ClothModifierData
*clmd, ClothSpring *s,
k = clmd->sim_parms->structural;
- scaling = k + s->stiffness *
ABS(clmd->sim_parms->max_struct-k);
+ scaling = k + s->stiffness *
fabsf(clmd->sim_parms->max_struct - k);
k = scaling / (clmd->sim_parms->avg_spring_len +
FLT_EPSILON);
@@ -1305,7 +1305,7 @@ DO_INLINE void cloth_calc_spring_force(ClothModifierData
*clmd, ClothSpring *s,
k = clmd->sim_parms->goalspring;
- scaling = k + s->stiffness * ABS(clmd->sim_parms->max_struct-k);
+ scaling = k + s->stiffness * fabsf(clmd->sim_parms->max_struct
- k);
k = verts [s->ij].goal * scaling /
(clmd->sim_parms->avg_spring_len + FLT_EPSILON);
@@ -1324,7 +1324,7 @@ DO_INLINE void cloth_calc_spring_force(ClothModifierData
*clmd, ClothSpring *s,
k = clmd->sim_parms->bending;
- scaling = k + s->stiffness *
ABS(clmd->sim_parms->max_bend-k);
+ scaling = k + s->stiffness *
fabsf(clmd->sim_parms->max_bend - k);
cb = k = scaling / (20.0f *
(clmd->sim_parms->avg_spring_len + FLT_EPSILON));
mul_fvector_S(bending_force, dir, fbstar(length, L, k,
cb));
diff --git a/source/blender/blenkernel/intern/mesh.c
b/source/blender/blenkernel/intern/mesh.c
index ee25b0a..af23a84 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -251,7 +251,7 @@ static int customdata_compare(CustomData *c1, CustomData
*c2, Mesh *m1, Mesh *m2
for (k = 0; k < dv1->totweight; k++, dw1++,
dw2++) {
if (dw1->def_nr != dw2->def_nr)
return
MESHCMP_DVERT_GROUPMISMATCH;
- if (ABS(dw1->weight - dw2->weight) >
thresh)
+ if (fabsf(dw1->weight - dw2->weight) >
thresh)
return
MESHCMP_DVERT_WEIGHTMISMATCH;
}
}
diff --git a/source/blender/editors/animation/anim_markers.c
b/source/blender/editors/animation/anim_markers.c
index 79c0c63..9818c31 100644
--- a/source/blender/editors/animation/anim_markers.c
+++ b/source/blender/editors/animation/anim_markers.c
@@ -173,7 +173,7 @@ TimeMarker *ED_markers_find_nearest_marker(ListBase
*markers, float x)
if (markers) {
for (marker = markers->first; marker; marker = marker->next) {
- dist = ABS((float)marker->frame - x);
+ dist = fabsf((float)marker->frame - x);
if (dist < min_dist) {
min_dist = dist;
diff --git a/source/blender/editors/interface/interface_widgets.c
b/source/blender/editors/interface/interface_widgets.c
index fa0c5c6..0691eb4 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -2335,7 +2335,7 @@ int ui_link_bezier_points(const rcti *rect, float
coord_array[][2], int resol)
vec[3][0] = rect->xmax;
vec[3][1] = rect->ymax;
- dist = 0.5f * ABS(vec[0][0] - vec[3][0]);
+ dist = 0.5f * fabsf(vec[0][0] - vec[3][0]);
vec[1][0] = vec[0][0] + dist;
vec[1][1] = vec[0][1];
diff --git a/source/blender/editors/screen/glutil.c
b/source/blender/editors/screen/glutil.c
index d356c3d..5c9778d 100644
--- a/source/blender/editors/screen/glutil.c
+++ b/source/blender/editors/screen/glutil.c
@@ -143,7 +143,7 @@ void fdrawbezier(float vec[4][3])
float dist;
float curve_res = 24, spline_step = 0.0f;
- dist = 0.5f * ABS(vec[0][0] - vec[3][0]);
+ dist = 0.5f * fabsf(vec[0][0] - vec[3][0]);
/* check direction later, for top sockets */
vec[1][0] = vec[0][0] + dist;
diff --git a/source/blender/editors/space_node/drawnode.c
b/source/blender/editors/space_node/drawnode.c
index 61e7fd8..3040789 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -3123,7 +3123,7 @@ int node_link_bezier_points(View2D *v2d, SpaceNode
*snode, bNodeLink *link, floa
toreroute = 0;
}
- dist = UI_GetThemeValue(TH_NODE_CURVING) * 0.10f * ABS(vec[0][0] -
vec[3][0]);
+ dist = UI_GetThemeValue(TH_NODE_CURVING) * 0.10f * fabsf(vec[0][0] -
vec[3][0]);
deltax = vec[3][0] - vec[0][0];
deltay = vec[3][1] - vec[0][1];
/* check direction later, for top sockets */
diff --git a/source/blender/editors/transform/transform_snap.c
b/source/blender/editors/transform/transform_snap.c
index 4cda560..b7dd8b7 100644
--- a/source/blender/editors/transform/transform_snap.c
+++ b/source/blender/editors/transform/transform_snap.c
@@ -1972,7 +1972,7 @@ static void removeDoublesPeel(ListBase *depth_peels)
for (peel = depth_peels->first; peel; peel = peel->next) {
DepthPeel *next_peel = peel->next;
- if (next_peel && ABS(peel->depth - next_peel->depth) < 0.0015f)
{
+ if (next_peel && fabsf(peel->depth - next_peel->depth) <
0.0015f) {
peel->next = next_peel->next;
if (next_peel->next) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
