[Bf-blender-cvs] [62880c82616] refactor-mesh-selection-generic: Merge branch 'master' into refactor-mesh-selection-generic

[Hans Goudey]

Commit: 62880c826161a6724f5f9d7486f2e07d0fb149ae
Author: Hans Goudey
Date:   Wed Sep 14 18:38:23 2022 -0500
Branches: refactor-mesh-selection-generic
https://developer.blender.org/rB62880c826161a6724f5f9d7486f2e07d0fb149ae

Merge branch 'master' into refactor-mesh-selection-generic

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



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

diff --cc source/blender/blenloader/intern/versioning_400.cc
index 00000000000,a5e1791d24c..ba8b430aa1d
mode 000000,100644..100644
--- a/source/blender/blenloader/intern/versioning_400.cc
+++ b/source/blender/blenloader/intern/versioning_400.cc
@@@ -1,0 -1,52 +1,53 @@@
+ /* SPDX-License-Identifier: GPL-2.0-or-later */
+ 
+ /** \file
+  * \ingroup blenloader
+  */
+ 
+ #define DNA_DEPRECATED_ALLOW
+ 
+ #include "CLG_log.h"
+ 
+ #include "BKE_main.h"
+ #include "BKE_mesh_legacy_convert.h"
+ 
+ #include "BLO_readfile.h"
+ 
+ #include "readfile.h"
+ 
+ #include "versioning_common.h"
+ 
+ // static CLG_LogRef LOG = {"blo.readfile.doversion"};
+ 
+ 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_mpoly_to_material_indices(&mesh);
+   BKE_mesh_legacy_bevel_weight_to_layers(&mesh);
+ }
+ 
+ void blo_do_versions_400(FileData * /*fd*/, Library * /*lib*/, Main *bmain)
+ {
+   // if (!MAIN_VERSION_ATLEAST(bmain, 400, 0)) {
+   /* This is done here because we will continue to write with the old format until 4.0, so we need
+    * to convert even "current" files. Keep the check commented out for now so the versioning isn't
+    * turned off right after the 4.0 bump. */
+   LISTBASE_FOREACH (Mesh *, mesh, &bmain->meshes) {
+     version_mesh_legacy_to_struct_of_array_format(*mesh);
+   }
+   // }
+ 
+   /**
+    * Versioning code until next subversion bump goes here.
+    *
+    * \note Be sure to check when bumping the version:
+    * - "versioning_userdef.c", #blo_do_versions_userdef
+    * - "versioning_userdef.c", #do_versions_theme
+    *
+    * \note Keep this message at the bottom of the function.
+    */
+   {
+     /* Keep this block, even when empty. */
+   }
+ }