Commit: b1b76cb4b469ab25319a43565ed564b7947dc60f Author: Joseph Eagar Date: Wed Sep 28 16:09:26 2022 -0700 Branches: temp-sculpt-cavity-mask https://developer.blender.org/rBb1b76cb4b469ab25319a43565ed564b7947dc60f
temp-sculpt-cavity-mask: Bump subversion =================================================================== M source/blender/blenkernel/BKE_blender_version.h M source/blender/blenloader/intern/versioning_300.cc =================================================================== diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index 808708922f8..b6dd25d9f29 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -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 2 /* 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 --git a/source/blender/blenloader/intern/versioning_300.cc b/source/blender/blenloader/intern/versioning_300.cc index 7ee14628f30..878a4078295 100644 --- a/source/blender/blenloader/intern/versioning_300.cc +++ b/source/blender/blenloader/intern/versioning_300.cc @@ -3528,13 +3528,6 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain) 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) { - brush->automasking_cavity_factor = 0.5f; - } - } - if (!MAIN_VERSION_ATLEAST(bmain, 304, 1)) { /* Image generation information transferred to tiles. */ if (!DNA_struct_elem_find(fd->filesdna, "ImageTile", "int", "gen_x")) { @@ -3591,6 +3584,13 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain) FOREACH_NODETREE_END; } + if (!MAIN_VERSION_ATLEAST(bmain, 304, 2)) { + /* Initialize brush curves sculpt settings. */ + LISTBASE_FOREACH (Brush *, brush, &bmain->brushes) { + brush->automasking_cavity_factor = 0.5f; + } + } + /** * Versioning code until next subversion bump goes here. * _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs