diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-04-08 05:23:38 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-04-08 05:24:52 +0300 |
| commit | 808ea6271a0107cc3df52fb0ef18ccec191f6f15 (patch) | |
| tree | 6da8eb7f2bb0df099255d3020f67f47d80465480 /source/blender/render/intern | |
| parent | ccfb9a96c346eb8df95775b34ae5388fa5fcacb1 (diff) | |
Cleanup: confusing if statements & alignment
Diffstat (limited to 'source/blender/render/intern')
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 4a767184c44..05bee6f165a 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -2249,9 +2249,9 @@ static void do_merge_fullsample(Render *re, bNodeTree *ntree) for (x = 0; x < re->rectx; x++, rf += 4, col += 4) { /* clamping to 1.0 is needed for correct AA */ - if (col[0] < 0.0f) col[0] = 0.0f; else if (col[0] > 1.0f) col[0] = 1.0f; - if (col[1] < 0.0f) col[1] = 0.0f; else if (col[1] > 1.0f) col[1] = 1.0f; - if (col[2] < 0.0f) col[2] = 0.0f; else if (col[2] > 1.0f) col[2] = 1.0f; + CLAMP(col[0], 0.0, 1.0f); + CLAMP(col[1], 0.0, 1.0f); + CLAMP(col[2], 0.0, 1.0f); add_filt_fmask_coord(filt, col, rf, re->rectx, re->recty, x, y); } |