diff options
author | Bastien Montagne <bastien@blender.org> | 2021-11-19 18:10:28 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2021-11-19 18:10:28 +0300 |
commit | ec71054a9b7bf0d2218fa230855fc9af2e71bcc2 (patch) | |
tree | 742c6c9c97b95936f7d6b9897f9ce350dbdabb8c /source/blender/blenkernel | |
parent | 330290d2a80d6b78f323cd1df9f3ea333d1cdb53 (diff) | |
parent | 33c5e7bcd5e5b790ee95caaa0c4d917996341266 (diff) |
Merge branch 'blender-v3.0-release'
Conflicts:
source/blender/blenkernel/BKE_blender_version.h
source/blender/blenloader/intern/versioning_300.c
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_blender_version.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index 43784b5a856..966d6c95421 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -39,13 +39,13 @@ extern "C" { /* Blender file format version. */ #define BLENDER_FILE_VERSION BLENDER_VERSION -#define BLENDER_FILE_SUBVERSION 2 +#define BLENDER_FILE_SUBVERSION 3 /* 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 * was written with too new a version. */ #define BLENDER_FILE_MIN_VERSION 300 -#define BLENDER_FILE_MIN_SUBVERSION 36 +#define BLENDER_FILE_MIN_SUBVERSION 42 /** User readable version string. */ const char *BKE_blender_version_string(void); |