diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-03-26 04:15:21 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-03-26 04:15:21 +0400 |
| commit | a7242c3162fd8ac28754b92c3bab8f003f912251 (patch) | |
| tree | 00d9123f9c398738446caea9644515e13ac81774 /source/blender/render | |
| parent | bd65fc176d39f8b083e0dbb7c6fda98de896257d (diff) | |
Code cleanup: add _v2 suffix to resolve_tri/quad functions
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/multires_bake.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/render/intern/source/multires_bake.c b/source/blender/render/intern/source/multires_bake.c index be6d0111819..be11df4e1a6 100644 --- a/source/blender/render/intern/source/multires_bake.c +++ b/source/blender/render/intern/source/multires_bake.c @@ -200,7 +200,7 @@ static void flush_pixel(const MResolvePixelData *data, const int x, const int y) multiresbake_get_normal(data, no1, data->face_index, i1); multiresbake_get_normal(data, no2, data->face_index, i2); - resolve_tri_uv(fUV, st, st0, st1, st2); + resolve_tri_uv_v2(fUV, st, st0, st1, st2); u = fUV[0]; v = fUV[1]; @@ -772,10 +772,10 @@ static void apply_heights_callback(DerivedMesh *lores_dm, DerivedMesh *hires_dm, if (mface.v4) { st3 = mtface[face_index].uv[3]; - resolve_quad_uv(uv, st, st0, st1, st2, st3); + resolve_quad_uv_v2(uv, st, st0, st1, st2, st3); } else - resolve_tri_uv(uv, st, st0, st1, st2); + resolve_tri_uv_v2(uv, st, st0, st1, st2); CLAMP(uv[0], 0.0f, 1.0f); CLAMP(uv[1], 0.0f, 1.0f); @@ -868,10 +868,10 @@ static void apply_tangmat_callback(DerivedMesh *lores_dm, DerivedMesh *hires_dm, if (mface.v4) { st3 = mtface[face_index].uv[3]; - resolve_quad_uv(uv, st, st0, st1, st2, st3); + resolve_quad_uv_v2(uv, st, st0, st1, st2, st3); } else - resolve_tri_uv(uv, st, st0, st1, st2); + resolve_tri_uv_v2(uv, st, st0, st1, st2); CLAMP(uv[0], 0.0f, 1.0f); CLAMP(uv[1], 0.0f, 1.0f); @@ -1112,10 +1112,10 @@ static void apply_ao_callback(DerivedMesh *lores_dm, DerivedMesh *hires_dm, void if (mface.v4) { st3 = mtface[face_index].uv[3]; - resolve_quad_uv(uv, st, st0, st1, st2, st3); + resolve_quad_uv_v2(uv, st, st0, st1, st2, st3); } else - resolve_tri_uv(uv, st, st0, st1, st2); + resolve_tri_uv_v2(uv, st, st0, st1, st2); CLAMP(uv[0], 0.0f, 1.0f); CLAMP(uv[1], 0.0f, 1.0f); |