[Bf-blender-cvs] [6212d6231ee] refactor-mesh-sharp-face-generic: Merge branch 'master' into refactor-mesh-sharp-face-generic

[Hans Goudey]

Commit: 6212d6231eefd6eb93e6c4ce52cbae79bccc32e2
Author: Hans Goudey
Date:   Mon Feb 6 16:57:25 2023 -0500
Branches: refactor-mesh-sharp-face-generic
https://developer.blender.org/rB6212d6231eefd6eb93e6c4ce52cbae79bccc32e2

Merge branch 'master' into refactor-mesh-sharp-face-generic

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



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

diff --cc source/blender/blenkernel/intern/mesh.cc
index 9de9d829562,f588bfb1326..076d8cbc166
--- a/source/blender/blenkernel/intern/mesh.cc
+++ b/source/blender/blenkernel/intern/mesh.cc
@@@ -269,9 -269,7 +269,8 @@@ static void mesh_blend_write(BlendWrite
        BKE_mesh_legacy_convert_hide_layers_to_flags(mesh);
        BKE_mesh_legacy_convert_selection_layers_to_flags(mesh);
        BKE_mesh_legacy_convert_material_indices_to_mpoly(mesh);
 +      BKE_mesh_legacy_sharp_faces_to_flags(mesh);
        BKE_mesh_legacy_bevel_weight_from_layers(mesh);
-       BKE_mesh_legacy_face_set_from_generic(mesh, poly_layers);
        BKE_mesh_legacy_edge_crease_from_layers(mesh);
        BKE_mesh_legacy_sharp_edges_to_flags(mesh);
        BKE_mesh_legacy_attribute_strings_to_flags(mesh);