diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-03-01 07:20:54 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-03-01 07:26:18 +0400 |
| commit | 13ea967cce4032564cfbbfe3010b538486f36524 (patch) | |
| tree | fff7d2eaddd8bc1b6034f76729bb34c12c555607 /source/blender/blenkernel | |
| parent | 315d85faa1b4f58a91041030dcac70085808c038 (diff) | |
Code cleanup: correct abs use and quiet warnings
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/curve.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/dynamicpaint.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/seqeffects.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 6c04100feff..2a4882f7d4b 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -3600,7 +3600,7 @@ void BKE_nurb_direction_switch(Nurb *nu) a--; fp2[a] = fp1[a]; while (a--) { - fp2[0] = fabs(fp1[1] - fp1[0]); + fp2[0] = fabsf(fp1[1] - fp1[0]); fp1++; fp2++; } diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 997876dcd58..b56522034c5 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -4133,7 +4133,7 @@ static void surface_determineForceTargetPoints(PaintSurfaceData *sData, int inde closest_d[0] = 1.0f - closest_d[1]; /* and multiply depending on how deeply force intersects surface */ - temp = fabs(force_intersect); + temp = fabsf(force_intersect); CLAMP(temp, 0.0f, 1.0f); mul_v2_fl(closest_d, acosf(temp) / (float)M_PI_2); } diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c index 0d05966dfa5..145b6954eb0 100644 --- a/source/blender/blenkernel/intern/seqeffects.c +++ b/source/blender/blenkernel/intern/seqeffects.c @@ -1501,8 +1501,8 @@ static float check_zone(WipeZone *wipezone, int x, int y, Sequence *seq, float f pointdist = sqrt(temp1 * temp1 + temp1 * temp1); temp2 = sqrt((halfx - x) * (halfx - x) + (halfy - y) * (halfy - y)); - if (temp2 > pointdist) output = in_band(hwidth, fabs(temp2 - pointdist), 0, 1); - else output = in_band(hwidth, fabs(temp2 - pointdist), 1, 1); + if (temp2 > pointdist) output = in_band(hwidth, fabsf(temp2 - pointdist), 0, 1); + else output = in_band(hwidth, fabsf(temp2 - pointdist), 1, 1); if (!wipe->forward) output = 1 - output; |