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

[Joseph Eagar]

Commit: a3e1545ba75a657d3c5de5ccbe1cebf770ac9c04
Author: Joseph Eagar
Date:   Thu Jun 9 07:55:23 2022 -0700
Branches: temp-sculpt-cavity-mask
https://developer.blender.org/rBa3e1545ba75a657d3c5de5ccbe1cebf770ac9c04

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

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



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

diff --cc source/blender/blenloader/intern/versioning_300.c
index 18bc0565433,57240b93ab1..d2f15995bce
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -3021,24 -3022,7 +3022,13 @@@ void blo_do_versions_300(FileData *fd, 
      }
    }
  
 +  if (!DNA_struct_elem_find(fd->filesdna, "Brush", "float", "automasking_cavity_factor")) {
 +    LISTBASE_FOREACH (Brush *, brush, &bmain->brushes) {
 +      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, 303, 1)) {
      FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
        versioning_replace_legacy_combined_and_separate_color_nodes(ntree);
      }