[Bf-blender-cvs] [6e6461c84c7] temp-sculpt-cavity-mask: Merge branch 'master' into temp-sculpt-cavity-mask

[Joseph Eagar]

Commit: 6e6461c84c76f47a169d561bd932011709847d33
Author: Joseph Eagar
Date:   Tue Sep 27 10:49:47 2022 -0700
Branches: temp-sculpt-cavity-mask
https://developer.blender.org/rB6e6461c84c76f47a169d561bd932011709847d33

Merge branch 'master' into temp-sculpt-cavity-mask

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



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

diff --cc source/blender/blenloader/intern/versioning_300.cc
index bc8721b2c40,f0ebc6c7942..eb313e31bc1
--- a/source/blender/blenloader/intern/versioning_300.cc
+++ b/source/blender/blenloader/intern/versioning_300.cc
@@@ -3527,30 -3519,7 +3527,15 @@@ void blo_do_versions_300(FileData *fd, 
  
      BKE_main_namemap_validate_and_fix(bmain);
    }
 +
 +  if (!MAIN_VERSION_ATLEAST(bmain, 304, 1)) {
 +    /* Initialize brush curves sculpt settings. */
 +    LISTBASE_FOREACH (Brush *, brush, &bmain->brushes) {
-       if (brush->ob_mode != OB_MODE_SCULPT) {
-         continue;
-       }
- 
 +      brush->automasking_cavity_factor = 0.5f;
 +    }
 +  }
 +
-   /**
-    * 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. */
- 
+   if (!MAIN_VERSION_ATLEAST(bmain, 304, 1)) {
      /* Image generation information transferred to tiles. */
      if (!DNA_struct_elem_find(fd->filesdna, "ImageTile", "int", "gen_x")) {
        LISTBASE_FOREACH (Image *, ima, &bmain->images) {