[Bf-blender-cvs] [ea81b0f9745] refactor-mesh-uv-map-generic: Fix mangled merge of versioning code.

[Martijn Versteegh]

Commit: ea81b0f9745b3a22baf1a79e678238570f7e80c7
Author: Martijn Versteegh
Date:   Thu Nov 10 20:17:12 2022 +0100
Branches: refactor-mesh-uv-map-generic
https://developer.blender.org/rBea81b0f9745b3a22baf1a79e678238570f7e80c7

Fix mangled merge of versioning code.

Versioning code was put in the mesh loading code, instead of versioning
in an earlier version of the SoA conversions. Later it was moved to the
proper place, but in the refactor-mesh-uv-as-attrib branch it remained
in the original location due to a merge error.

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

M	source/blender/blenkernel/intern/mesh.cc
M	source/blender/blenloader/intern/versioning_400.cc

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

diff --git a/source/blender/blenkernel/intern/mesh.cc b/source/blender/blenkernel/intern/mesh.cc
index dc9de1e61c2..53c61a1a5e7 100644
--- a/source/blender/blenkernel/intern/mesh.cc
+++ b/source/blender/blenkernel/intern/mesh.cc
@@ -365,13 +365,6 @@ static void mesh_blend_read_data(BlendDataReader *reader, ID *id)
     }
   }
 
-  if (!BLO_read_data_is_undo(reader)) {
-    BKE_mesh_legacy_convert_flags_to_hide_layers(mesh);
-    BKE_mesh_legacy_convert_uvs_to_generic(mesh);
-    BKE_mesh_legacy_convert_mpoly_to_material_indices(mesh);
-    BKE_mesh_legacy_bevel_weight_to_layers(mesh);
-  }
-
   /* We don't expect to load normals from files, since they are derived data. */
   BKE_mesh_normals_tag_dirty(mesh);
   BKE_mesh_assert_normals_dirty_or_calculated(mesh);
diff --git a/source/blender/blenloader/intern/versioning_400.cc b/source/blender/blenloader/intern/versioning_400.cc
index 2616bb890a3..3302aa890d9 100644
--- a/source/blender/blenloader/intern/versioning_400.cc
+++ b/source/blender/blenloader/intern/versioning_400.cc
@@ -23,6 +23,7 @@ static void version_mesh_legacy_to_struct_of_array_format(Mesh &mesh)
 {
   BKE_mesh_legacy_convert_flags_to_selection_layers(&mesh);
   BKE_mesh_legacy_convert_flags_to_hide_layers(&mesh);
+  BKE_mesh_legacy_convert_uvs_to_generic(&mesh);
   BKE_mesh_legacy_convert_mpoly_to_material_indices(&mesh);
   BKE_mesh_legacy_bevel_weight_to_layers(&mesh);
   BKE_mesh_legacy_face_set_to_generic(&mesh);