diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-08-26 12:57:19 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-26 12:57:19 +0300 |
| commit | 56ec606413ef67aead62a04e8e1c7d89be90ece4 (patch) | |
| tree | 20ea5e3b1f549bd76bc9f8ec6edb8d3ef9395bcf /source/blender/blenkernel/intern/colortools.c | |
| parent | 82f771b169ec6610da0c172f7624f696736f8b65 (diff) | |
Cleanup: style
Diffstat (limited to 'source/blender/blenkernel/intern/colortools.c')
| -rw-r--r-- | source/blender/blenkernel/intern/colortools.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/colortools.c b/source/blender/blenkernel/intern/colortools.c index 0684231480b..c090569421d 100644 --- a/source/blender/blenkernel/intern/colortools.c +++ b/source/blender/blenkernel/intern/colortools.c @@ -956,17 +956,15 @@ static void curvemapping_evaluateRGBF_filmlike(const CurveMapping *cumap, float static float curvemapping_weighted_standard_triangle(float a, float b, float a1) { - if (a != b) - { + if (a != b) { float b1; float a2 = a1 - a; - if (b < a) - { - b1 = b + a2 * b / a ; + if (b < a) { + b1 = b + a2 * b / a ; } else { - b1 = b + a2 * (65535.f - b) / (65535.f - a); + b1 = b + a2 * (65535.0f - b) / (65535.0f - a); } return b1; @@ -992,8 +990,7 @@ void curvemapping_evaluate_premulRGBF_ex( const float g = (vecin[1] - black[1]) * bwmul[1]; const float b = (vecin[2] - black[2]) * bwmul[2]; - switch (cumap->tone) - { + switch (cumap->tone) { default: case CURVE_TONE_STANDARD: { |