Xylvier/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Conversation 0 Commits 318 Files Changed 1069 +9 -2
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 19ca2e905e - Show all commits

2
release/datafiles/userdef/userdef_default.c
View File

@ -128,7 +128,7 @@ const UserDef U_default = {
.pad_rot_angle = 15, .pad_rot_angle = 15,
.rvisize = 25, .rvisize = 25,
.rvibright = 8, .rvibright = 8,
.recent_files = 10, .recent_files = 20,
.smooth_viewtx = 200, .smooth_viewtx = 200,
.glreslimit = 0, .glreslimit = 0,
.color_picker_type = USER_CP_CIRCLE_HSV, .color_picker_type = USER_CP_CIRCLE_HSV,

2
source/blender/blenkernel/BKE_blender_version.h
View File

@ -25,7 +25,7 @@ extern "C" {
/* Blender file format version. */ /* Blender file format version. */
#define BLENDER_FILE_VERSION BLENDER_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 /* 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 * version. Older Blender versions will test this and show a warning if the file

7
source/blender/blenloader/intern/versioning_userdef.c
View File

@ -791,6 +791,13 @@ void blo_do_versions_userdef(UserDef *userdef)
userdef->animation_flag |= USER_ANIM_HIGH_QUALITY_DRAWING; 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. * Versioning code until next subversion bump goes here.
* *