[Bf-blender-cvs] [cca8b650947] refactor-mesh-bevel-weight-generic: Manual merge of master into D14077

[Hans Goudey]

Commit: cca8b650947494db6ab79dcecb88508d34516b57
Author: Hans Goudey
Date:   Sat Aug 13 21:52:35 2022 -0400
Branches: refactor-mesh-bevel-weight-generic
https://developer.blender.org/rBcca8b650947494db6ab79dcecb88508d34516b57

Manual merge of master into D14077

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

M	source/blender/blenkernel/BKE_mesh_legacy_convert.h
M	source/blender/blenkernel/intern/mesh.cc
M	source/blender/blenkernel/intern/mesh_legacy_convert.cc
M	source/blender/makesrna/intern/rna_mesh.c

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

diff --git a/source/blender/blenkernel/BKE_mesh_legacy_convert.h b/source/blender/blenkernel/BKE_mesh_legacy_convert.h
index 7dcfc8379ef..e1839e7e8d6 100644
--- a/source/blender/blenkernel/BKE_mesh_legacy_convert.h
+++ b/source/blender/blenkernel/BKE_mesh_legacy_convert.h
@@ -18,7 +18,6 @@ struct Mesh;
 struct MFace;
 
 /**
-<<<<<<< HEAD
  * Copy bevel weights from separate layers into vertices and edges.
  */
 void BKE_mesh_legacy_bevel_weight_from_layers(struct Mesh *mesh);
@@ -26,7 +25,8 @@ void BKE_mesh_legacy_bevel_weight_from_layers(struct Mesh *mesh);
  * Copy bevel weights from vertices and edges to separate layers.
  */
 void BKE_mesh_legacy_bevel_weight_to_layers(struct Mesh *mesh);
-=======
+
+/**
  * Convert the hidden element attributes to the old flag format for writing.
  */
 void BKE_mesh_legacy_convert_hide_layers_to_flags(struct Mesh *mesh);
@@ -35,7 +35,6 @@ void BKE_mesh_legacy_convert_hide_layers_to_flags(struct Mesh *mesh);
  * Only add the attributes when there are any elements in each domain hidden.
  */
 void BKE_mesh_legacy_convert_flags_to_hide_layers(struct Mesh *mesh);
->>>>>>> master
 
 /**
  * Recreate #MFace Tessellation.
diff --git a/source/blender/blenkernel/intern/mesh.cc b/source/blender/blenkernel/intern/mesh.cc
index c7a32fd7b03..3ec3c0ef3b4 100644
--- a/source/blender/blenkernel/intern/mesh.cc
+++ b/source/blender/blenkernel/intern/mesh.cc
@@ -5,8 +5,6 @@
  * \ingroup bke
  */
 
-#include <algorithm>
-
 #include "MEM_guardedalloc.h"
 
 /* Allow using deprecated functionality for .blend file I/O. */
@@ -66,13 +64,8 @@
 #include "BLO_read_write.h"
 
 using blender::float3;
-<<<<<<< HEAD
-using blender::IndexRange;
-using blender::MutableSpan;
-=======
 using blender::MutableSpan;
 using blender::VArray;
->>>>>>> master
 using blender::Vector;
 
 static void mesh_clear_geometry(Mesh *mesh);
@@ -254,6 +247,7 @@ static void mesh_blend_write(BlendWriter *writer, ID *id, const void *id_address
   else {
     if (!BLO_write_is_undo(writer)) {
       BKE_mesh_legacy_convert_hide_layers_to_flags(mesh);
+      BKE_mesh_legacy_bevel_weight_from_layers(mesh);
     }
 
     CustomData_blend_write_prepare(mesh->vdata, vert_layers, {".hide_vert"});
@@ -262,10 +256,6 @@ static void mesh_blend_write(BlendWriter *writer, ID *id, const void *id_address
     CustomData_blend_write_prepare(mesh->pdata, poly_layers, {".hide_poly"});
   }
 
-  if (!BLO_write_is_undo(writer)) {
-    BKE_mesh_legacy_bevel_weight_from_layers(mesh);
-  }
-
   BLO_write_id_struct(writer, Mesh, id_address, &mesh->id);
   BKE_id_blend_write(writer, &mesh->id);
 
@@ -343,11 +333,8 @@ static void mesh_blend_read_data(BlendDataReader *reader, ID *id)
   }
 
   if (!BLO_read_data_is_undo(reader)) {
-<<<<<<< HEAD
-    BKE_mesh_legacy_bevel_weight_to_layers(mesh);
-=======
     BKE_mesh_legacy_convert_flags_to_hide_layers(mesh);
->>>>>>> master
+    BKE_mesh_legacy_bevel_weight_to_layers(mesh);
   }
 
   /* We don't expect to load normals from files, since they are derived data. */
diff --git a/source/blender/blenkernel/intern/mesh_legacy_convert.cc b/source/blender/blenkernel/intern/mesh_legacy_convert.cc
index 00c6e3f2806..f6c2a8066fb 100644
--- a/source/blender/blenkernel/intern/mesh_legacy_convert.cc
+++ b/source/blender/blenkernel/intern/mesh_legacy_convert.cc
@@ -878,7 +878,6 @@ void BKE_mesh_add_mface_layers(CustomData *fdata, CustomData *ldata, int total)
 /** \} */
 
 /* -------------------------------------------------------------------- */
-<<<<<<< HEAD
 /** \name Bevel Weight Conversion
  * \{ */
 
@@ -932,7 +931,12 @@ void BKE_mesh_legacy_bevel_weight_to_layers(Mesh *mesh)
     for (const int i : edges.index_range()) {
       weights[i] = edges[i].bweight / 255.0f;
     }
-=======
+  }
+}
+
+/** \} */
+
+/* -------------------------------------------------------------------- */
 /** \name Hide Attribute and Legacy Flag Conversion
  * \{ */
 
@@ -1013,7 +1017,6 @@ void BKE_mesh_legacy_convert_flags_to_hide_layers(Mesh *mesh)
       }
     });
     hide_poly.finish();
->>>>>>> master
   }
 }
 
diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c
index 63d8d572c5f..719023697b6 100644
--- a/source/blender/makesrna/intern/rna_mesh.c
+++ b/source/blender/makesrna/intern/rna_mesh.c
@@ -352,10 +352,6 @@ static void rna_Mesh_update_positions_tag(Main *bmain, Scene *scene, PointerRNA
 /** \name Property get/set Callbacks
  * \{ */
 
-<<<<<<< HEAD
-static int rna_MeshVertex_index_get(PointerRNA *ptr);
-static int rna_MeshEdge_index_get(PointerRNA *ptr);
-=======
 static int rna_MeshVertex_index_get(PointerRNA *ptr)
 {
   const Mesh *mesh = rna_mesh(ptr);
@@ -405,7 +401,6 @@ static int rna_MeshLoopTriangle_index_get(PointerRNA *ptr)
   BLI_assert(index < mesh->runtime.looptris.len);
   return index;
 }
->>>>>>> master
 
 static void rna_MeshVertex_normal_get(PointerRNA *ptr, float *value)
 {