[Bf-blender-cvs] [18f78ba33cf] refactor-mesh-bevel-weight-generic: Merge branch 'temp-legacy-mesh-format-option' into refactor-mesh-bevel-weight-generic

[Hans Goudey]

Commit: 18f78ba33cfe4e369135e1c9c80f88bb24a90f2e
Author: Hans Goudey
Date:   Thu Jun 23 16:59:05 2022 -0500
Branches: refactor-mesh-bevel-weight-generic
https://developer.blender.org/rB18f78ba33cfe4e369135e1c9c80f88bb24a90f2e

Merge branch 'temp-legacy-mesh-format-option' into refactor-mesh-bevel-weight-generic

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



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

diff --cc source/blender/blenkernel/BKE_blender_version.h
index 2cd753da9d3,04767a742ce..19bb4826956
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@@ -25,7 -25,7 +25,7 @@@ extern "C" 
  
  /* Blender file format version. */
  #define BLENDER_FILE_VERSION BLENDER_VERSION
- #define BLENDER_FILE_SUBVERSION 1
 -#define BLENDER_FILE_SUBVERSION 3
++#define BLENDER_FILE_SUBVERSION 4
  
  /* Minimum Blender version that supports reading file written with the current
   * version. Older Blender versions will test this and show a warning if the file
diff --cc source/blender/blenloader/intern/versioning_300.c
index b0a8fa7e24a,844354c8bc3..80a8e9b7fd4
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -29,9 -30,9 +30,10 @@@
  #include "DNA_gpencil_modifier_types.h"
  #include "DNA_lineart_types.h"
  #include "DNA_listBase.h"
+ #include "DNA_mask_types.h"
  #include "DNA_material_types.h"
  #include "DNA_mesh_types.h"
 +#include "DNA_meshdata_types.h"
  #include "DNA_modifier_types.h"
  #include "DNA_screen_types.h"
  #include "DNA_space_types.h"
@@@ -3053,33 -3160,21 +3161,41 @@@ void blo_do_versions_300(FileData *fd, 
      }
      FOREACH_NODETREE_END;
  
-     /* Initialize brush curves sculpt settings. */
-     LISTBASE_FOREACH (Brush *, brush, &bmain->brushes) {
-       if (brush->ob_mode != OB_MODE_SCULPT_CURVES) {
-         continue;
-       }
-       if (brush->curves_sculpt_settings->points_per_curve == 0) {
-         brush->curves_sculpt_settings->points_per_curve = 8;
-       }
+     LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
+       version_fix_image_format_copy(bmain, &scene->r.im_format);
      }
+   }
  
-     /* UDIM Packing. */
-     if (!DNA_struct_elem_find(fd->filesdna, "ImagePackedFile", "int", "tile_number")) {
-       for (Image *ima = bmain->images.first; ima; ima = ima->id.next) {
-         int view;
-         LISTBASE_FOREACH_INDEX (ImagePackedFile *, imapf, &ima->packedfiles, view) {
-           imapf->view = view;
-           imapf->tile_number = 1001;
++  if (!MAIN_VERSION_ATLEAST(bmain, 303, 1)) {
++    /* Move mesh bevel weights from structs to dedicated custom data layers, like edit mode. */
++    LISTBASE_FOREACH (Mesh *, mesh, &bmain->meshes) {
++      if (mesh->cd_flag & ME_CDFLAG_EDGE_BWEIGHT) {
++        float *weights = (float *)CustomData_add_layer(
++            &mesh->edata, CD_BWEIGHT, CD_DEFAULT, NULL, mesh->totedge);
++        for (int i = 0; i < mesh->totedge; i++) {
++          weights[i] = mesh->medge[i].bweight / 255.0f;
 +        }
 +      }
-     }
- 
-     /* Merge still offsets into start/end offsets. */
-     LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
-       Editing *ed = SEQ_editing_get(scene);
-       if (ed != NULL) {
-         SEQ_for_each_callback(&ed->seqbase, version_merge_still_offsets, NULL);
++      if (mesh->cd_flag & ME_CDFLAG_VERT_BWEIGHT) {
++        float *weights = (float *)CustomData_add_layer(
++            &mesh->vdata, CD_BWEIGHT, CD_DEFAULT, NULL, mesh->totvert);
++        for (int i = 0; i < mesh->totvert; i++) {
++          weights[i] = mesh->mvert[i].bweight / 255.0f;
++        }
 +      }
 +    }
 +  }
++
+   /**
+    * 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. */
+   }
  }