diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-03-04 03:31:51 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-03-04 03:31:51 +0300 |
| commit | 38ed95fe8d6f4c47c0c5f09ffecc987d75150dcc (patch) | |
| tree | 8884ecd983657941c1375d61fdeb74dd4dabe43a /source/blender/render | |
| parent | 89b10b8d423a0ee851d9299af279ab93660f15f4 (diff) | |
Cleanup: replace CLAMP macros with functions
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/multires_bake.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/source/blender/render/intern/source/multires_bake.c b/source/blender/render/intern/source/multires_bake.c index 6fe4c080c2b..5421f487de5 100644 --- a/source/blender/render/intern/source/multires_bake.c +++ b/source/blender/render/intern/source/multires_bake.c @@ -838,8 +838,7 @@ static void apply_heights_callback(DerivedMesh *lores_dm, resolve_tri_uv_v2(uv, st, st0, st1, st2); } - CLAMP(uv[0], 0.0f, 1.0f); - CLAMP(uv[1], 0.0f, 1.0f); + clamp_v2(uv, 0.0f, 1.0f); get_ccgdm_data( lores_dm, hires_dm, height_data->orig_index_mp_to_orig, lvl, lt, uv[0], uv[1], p1, NULL); @@ -951,8 +950,7 @@ static void apply_tangmat_callback(DerivedMesh *lores_dm, resolve_tri_uv_v2(uv, st, st0, st1, st2); } - CLAMP(uv[0], 0.0f, 1.0f); - CLAMP(uv[1], 0.0f, 1.0f); + clamp_v2(uv, 0.0f, 1.0f); get_ccgdm_data( lores_dm, hires_dm, normal_data->orig_index_mp_to_orig, lvl, lt, uv[0], uv[1], NULL, n); @@ -1219,8 +1217,7 @@ static void apply_ao_callback(DerivedMesh *lores_dm, resolve_tri_uv_v2(uv, st, st0, st1, st2); } - CLAMP(uv[0], 0.0f, 1.0f); - CLAMP(uv[1], 0.0f, 1.0f); + clamp_v2(uv, 0.0f, 1.0f); get_ccgdm_data( lores_dm, hires_dm, ao_data->orig_index_mp_to_orig, lvl, lt, uv[0], uv[1], pos, nrm); |