From 5e835ca54b76b789ffb19d6d68a4e97365e70429 Mon Sep 17 00:00:00 2001 From: Harley Acheson Date: Wed, 15 Mar 2023 08:31:25 -0700 Subject: [PATCH] Updating because of recent main subversion change --- release/datafiles/userdef/userdef_default.c | 2 +- source/blender/blenkernel/BKE_blender_version.h | 2 +- source/blender/blenloader/intern/versioning_userdef.c | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/release/datafiles/userdef/userdef_default.c b/release/datafiles/userdef/userdef_default.c index fdd648ab110..ce6f0b0a072 100644 --- a/release/datafiles/userdef/userdef_default.c +++ b/release/datafiles/userdef/userdef_default.c @@ -128,7 +128,7 @@ const UserDef U_default = { .pad_rot_angle = 15, .rvisize = 25, .rvibright = 8, - .recent_files = 10, + .recent_files = 20, .smooth_viewtx = 200, .glreslimit = 0, .color_picker_type = USER_CP_CIRCLE_HSV, diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index c9d668870cc..6c85f234d57 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 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 --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c index ed2698d2868..a6e55f7b12d 100644 --- a/source/blender/blenloader/intern/versioning_userdef.c +++ b/source/blender/blenloader/intern/versioning_userdef.c @@ -791,6 +791,13 @@ void blo_do_versions_userdef(UserDef *userdef) userdef->animation_flag |= USER_ANIM_HIGH_QUALITY_DRAWING; } + if (!USER_VERSION_ATLEAST(306, 4)) { + /* Increase the number of recently-used files if using the old default value. */ + if (userdef->recent_files == 10) { + userdef->recent_files = 20; + } + } + /** * Versioning code until next subversion bump goes here. * -- 2.30.2