From 0ea22e1b9e31e340ef397b2617905bd92f542e19 Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 21 May 2016 17:24:51 +0000 Subject: [PATCH] Fix -Wshadow warnings in assign_uvs_to_side --- similar/editor/seguvs.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/similar/editor/seguvs.cpp b/similar/editor/seguvs.cpp index ddf44f725..12f34eb66 100644 --- a/similar/editor/seguvs.cpp +++ b/similar/editor/seguvs.cpp @@ -402,17 +402,17 @@ static void assign_uvs_to_side(const vsegptridx_t segp, int sidenum, uvl *uva, u vv1v0, vv3v0 }; - const auto assign_uvl = [&](const vms_vector &tvec, const uvl &uvb) { + const auto assign_uvl = [&](const vms_vector &tvec, const uvl &uvi) { const auto drt = vm_vec_dot(fr.rvec, tvec); const auto dft = vm_vec_dot(fr.fvec, tvec); return uvl{ - uvb.u + + uvi.u + fixdiv(fixmul(ruvmag.u, drt), mag01) + fixdiv(fixmul(fuvmag.u, dft), mag01), - uvb.v + + uvi.v + fixdiv(fixmul(ruvmag.v, drt), mag01) + fixdiv(fixmul(fuvmag.v, dft), mag01), - uvb.l + uvi.l }; }; uvls[(vhi+1)%4] = assign_uvl(vm_vec_sub(Vertices[v2],Vertices[v1]), uvhi);