# Conflicts:
#	source/blender/editors/uvedit/uvedit_parametrizer.h
#	source/blender/editors/uvedit/uvedit_unwrap_ops.c
#	source/blender/geometry/intern/uv_parametrizer.c

@@ -222,0 +263,4 @@
+  }
+  else {
+    /* We use the properties from the last unwrap operator for subsequent
+     * live unwrap and minize stretch operators. */

@@ -2605,0 +2826,4 @@
+  else {
+    uiDefAutoButsRNA(
+        layout, &ptr, unwrap_draw_check_prop_abf, NULL, NULL, UI_BUT_LABEL_ALIGN_NONE, false);
+  }

@@ -2610,3 +2838,4 @@
       {0, nullptr, 0, nullptr, nullptr},
   };
 
+  static const EnumPropertyItem reflection_items[] = {{0, "ALLOW", 0, "Allow Flips", ""},

@@ -4286,0 +4961,4 @@
+    slim::MatrixTransferChart &mt_chart = mt->mt_charts[i];
+
+    bool select = false, deselect = false;
+    int npins = 0;

@@ -0,0 +1,89 @@
+/* SPDX-FileCopyrightText: 2023 Blender Authors

@@ -0,0 +1,17 @@
+/* SPDX-FileCopyrightText: 2023 Blender Authors

@@ -0,0 +1,94 @@
+/* SPDX-FileCopyrightText: 2013 Alec Jacobson

@@ -0,0 +1,40 @@
+/* SPDX-FileCopyrightText: 2014 Alec Jacobson, 2023 Blender Authors

@@ -0,0 +1,196 @@
+/* SPDX-FileCopyrightText: 2013 Alec Jacobson

@@ -0,0 +1,48 @@
+/* SPDX-FileCopyrightText: 2013 Alec Jacobson, 2023 Blender Authors

@@ -0,0 +1,43 @@
+/* SPDX-FileCopyrightText: 2013 Alec Jacobson, 2023 Blender Authors

@@ -0,0 +1,58 @@
+/* SPDX-FileCopyrightText: 2013 Alec Jacobson, 2023 Blender Authors

@@ -0,0 +1,165 @@
+/* SPDX-FileCopyrightText: 2016 Michael Rabinovich, 2023 Blender Authors

@@ -0,0 +1,42 @@
+/* SPDX-FileCopyrightText: 2016 Michael Rabinovich, 2023 Blender Authors

@@ -0,0 +1,222 @@
+/* SPDX-FileCopyrightText: 2023 Blender Authors

@@ -0,0 +1,65 @@
+/* SPDX-FileCopyrightText: 2023 Blender Authors

@@ -0,0 +1,235 @@
+/* SPDX-FileCopyrightText: 2023 Blender Authors

@@ -0,0 +1,14 @@
+/* SPDX-FileCopyrightText: 2023 Blender Authors

@@ -0,0 +1,803 @@
+/* SPDX-FileCopyrightText: 2016 Michael Rabinovich, 2023 Blender Authors

@@ -0,0 +1,118 @@
+/* SPDX-FileCopyrightText: 2016 Michael Rabinovich, 2023 Blender Authors

@@ -0,0 +1,47 @@
+/* SPDX-FileCopyrightText: 2023 Blender Authors

@@ -0,0 +1,162 @@
+/* SPDX-FileCopyrightText: 2023 Blender Authors

@@ -0,0 +1,288 @@
+/* SPDX-FileCopyrightText: 2023 Blender Authors

@@ -0,0 +1,59 @@
+/* SPDX-FileCopyrightText: 2023 Blender Authors

@@ -0,0 +1,95 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */

@@ -99,0 +114,4 @@
+ */
+
+struct ParamSlimOptions {
+ public:

@@ -99,0 +121,4 @@
+  bool skip_initialization = false;
+};
+
+void uv_parametrizer_slim_solve(ParamHandle *handle,

@@ -99,0 +126,4 @@
+                                int *count_changed,
+                                int *count_failed);
+
+void uv_parametrizer_slim_live_begin(ParamHandle *handle, const ParamSlimOptions *mt_options);

@@ -7,2 +7,4 @@
  */
 
+#include <functional>
+#include <vector>

@@ -344,6 +354,31 @@ static void p_face_angles(PFace *f, double *r_a1, double *r_a2, double *r_a3)
   p_triangle_angles(v1->co, v2->co, v3->co, r_a1, r_a2, r_a3);
 }
 
+static float p_vec_cos(const float v1[3], const float v2[3], const float v3[3])

@@ -645,2 +703,3 @@
 
-static PVert *p_vert_add(ParamHandle *handle, PHashKey key, const float co[3], PEdge *e)
+static PVert *p_vert_add(
+    ParamHandle *handle, PHashKey key, const float co[3], const float weight, PEdge *e)

@@ -1026,3 +1088,1 @@
-  e1->vert = p_vert_lookup(handle, vkeys[i1], co[i1], e1);
-  e2->vert = p_vert_lookup(handle, vkeys[i2], co[i2], e2);
-  e3->vert = p_vert_lookup(handle, vkeys[i3], co[i3], e3);
+  float weight1, weight2, weight3;

@@ -1680,6 +1755,7 @@ static void p_collapse_edge(PEdge *edge, PEdge *pair)
   }
 }
 
+#if 0

@@ -2201,0 +2250,4 @@
+{
+  /* Move from `collapsed_*`. */
+
+  PVert *v, *nextv = nullptr;

@@ -2201,0 +2254,4 @@
+  PEdge *e, *nexte = nullptr;
+  PFace *f, *nextf = nullptr;
+
+  for (v = chart->collapsed_verts; v; v = nextv) {

@@ -3802,1 +3883,4 @@
     float *tri_uv[3] = {uv[v0], uv[v1], uv[v2]};
+
+    float *tri_weight = nullptr;
+    float tri_weight_tmp[3];

@@ -4286,0 +4389,4 @@
+  p_collapsing_verts(edge, pair, &oldv, &keepv);
+
+  /* do not collapse a pinned vertex unless the target vertex
+   * is also pinned */

@@ -4286,0 +4408,4 @@
+  return p_edge_length_squared(collapse_e);
+}
+
+static void p_chart_collapse_doubles(PChart *chart, float threshold)

@@ -4286,0 +4443,4 @@
+static bool p_validate_corrected_coords_point(const PEdge *corr_e,
+                                              const float corr_co1[3],
+                                              const float corr_co2[3],
+                                              float min_area,

@@ -4286,0 +4520,4 @@
+    const PVert *other_v1 = e->next->vert;
+    const PVert *other_v2 = e->next->next->vert;
+
+    float area = area_tri_v3(corr_co, other_v1->co, other_v2->co);

@@ -4286,0 +4542,4 @@
+
+static bool p_edge_matrix(float R[3][3], const float edge_dir[3])
+{
+  static const float eps = 1.0e-5;

@@ -4286,0 +4603,4 @@
+                                                      float min_area,
+                                                      float min_angle_cos)
+{
+  static const float ref_edges[][3] = {{1.0f, 0.0f, 0.0f},

@@ -4286,0 +4635,4 @@
+      PEdge *e = f->edge;
+
+      for (int i = 0; i < 3; i++) {
+        float angle = (float)i / 3.0f * 2.0f * M_PI;

@@ -4286,0 +4697,4 @@
+    float face_area = p_face_area(f);
+
+    PEdge *max_edge = nullptr;
+    float max_edge_len = -std::numeric_limits<float>::infinity();

@@ -4286,0 +4700,4 @@
+    float max_edge_len = -std::numeric_limits<float>::infinity();
+
+    PEdge *min_edge = nullptr;
+    float min_edge_len = std::numeric_limits<float>::infinity();

@@ -4286,0 +4771,4 @@
+    PVert *corr_v = corr_e->vert;
+
+    /* check 4 distinct directions */
+    static const int DIR_COUNT = 16;

@@ -4286,0 +5168,4 @@
+                                        slim::MatrixTransferChart &mt_chart,
+                                        slim::PinnedVertexData &pinned_vertex_data)
+{
+  auto &pinned_vertex_indices = pinned_vertex_data.pinned_vertex_indices;