[Bf-blender-cvs] [d3374e5337d] master: Fix build and warnings from previous commit.

[Chris Blackbourn]

Commit: d3374e5337d5d50b842e274348813c15d4f57705
Author: Chris Blackbourn
Date:   Thu Jul 14 16:19:21 2022 +1200
Branches: master
https://developer.blender.org/rBd3374e5337d5d50b842e274348813c15d4f57705

Fix build and warnings from previous commit.

===================================================================

M	source/blender/geometry/intern/uv_parametrizer.c
M	source/blender/nodes/geometry/nodes/node_geo_uv_unwrap.cc

===================================================================

diff --git a/source/blender/geometry/intern/uv_parametrizer.c b/source/blender/geometry/intern/uv_parametrizer.c
index 38eb50722cf..7ef17d4e9d0 100644
--- a/source/blender/geometry/intern/uv_parametrizer.c
+++ b/source/blender/geometry/intern/uv_parametrizer.c
@@ -4260,7 +4260,6 @@ void GEO_uv_parametrizer_average(ParamHandle *phandle,
   }
 
   for (i = 0; i < phandle->ncharts; i++) {
-    PFace *f;
     chart = phandle->charts[i];
 
     if (ignore_pinned && (chart->flag & PCHART_HAS_PINS)) {
@@ -4298,9 +4297,9 @@ void GEO_uv_parametrizer_average(ParamHandle *phandle,
             continue;
           }
           float cou[3], cov[3]; /* i.e. Texture "U" and texture "V" in 3D co-ordinates.*/
-          for (int i = 0; i < 3; i++) {
-            cou[i] = m[0][0] * (va->co[i] - vc->co[i]) + m[0][1] * (vb->co[i] - vc->co[i]);
-            cov[i] = m[1][0] * (va->co[i] - vc->co[i]) + m[1][1] * (vb->co[i] - vc->co[i]);
+          for (int k = 0; k < 3; k++) {
+            cou[k] = m[0][0] * (va->co[k] - vc->co[k]) + m[0][1] * (vb->co[k] - vc->co[k]);
+            cov[k] = m[1][0] * (va->co[k] - vc->co[k]) + m[1][1] * (vb->co[k] - vc->co[k]);
           }
           const float weight = p_face_area(f);
           scale_cou += len_v3(cou) * weight;
@@ -4347,7 +4346,7 @@ void GEO_uv_parametrizer_average(ParamHandle *phandle,
     chart->u.pack.area = 0.0f;    /* 3d area */
     chart->u.pack.rescale = 0.0f; /* UV area, abusing rescale for tmp storage, oh well :/ */
 
-    for (f = chart->faces; f; f = f->nextlink) {
+    for (PFace *f = chart->faces; f; f = f->nextlink) {
       chart->u.pack.area += p_face_area(f);
       chart->u.pack.rescale += fabsf(p_face_uv_area_signed(f));
     }
diff --git a/source/blender/nodes/geometry/nodes/node_geo_uv_unwrap.cc b/source/blender/nodes/geometry/nodes/node_geo_uv_unwrap.cc
index 2ec14ad2d29..03657f3e016 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_uv_unwrap.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_uv_unwrap.cc
@@ -121,7 +121,7 @@ static VArray<float3> construct_uv_gvarray(const MeshComponent &component,
   GEO_uv_parametrizer_lscm_begin(handle, false, method == GEO_NODE_UV_UNWRAP_METHOD_ANGLE_BASED);
   GEO_uv_parametrizer_lscm_solve(handle, nullptr, nullptr);
   GEO_uv_parametrizer_lscm_end(handle);
-  GEO_uv_parametrizer_average(handle, true);
+  GEO_uv_parametrizer_average(handle, true, false, false);
   GEO_uv_parametrizer_pack(handle, margin, true, true);
   GEO_uv_parametrizer_flush(handle);
   GEO_uv_parametrizer_delete(handle);