blender
/
blender
134
399
Fork 581
Code Issues 6.3k Pull Requests 755 Projects 19 Wiki Activity

Fix T70539: file folder color preference not saved 

Please always bump the subversion for cases like this.
This commit is contained in:
Brecht Van Lommel 2019-10-05 10:27:25 +02:00
parent a498a5494c
commit 0905af68ec
Notes: blender-bot 2023-02-14 02:43:21 +01:00 
Referenced by issue #70539, Blender 2.81 does not save folder colors in preferences
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,7 @@
* \note Use #STRINGIFY() rather than defining with quotes.
*/
#define BLENDER_VERSION 281
#define BLENDER_SUBVERSION 13
#define BLENDER_SUBVERSION 14
/** Several breakages with 280, e.g. collections vs layers. */
#define BLENDER_MINVERSION 280
#define BLENDER_MINSUBVERSION 0

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

@ -147,10 +147,7 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
FROM_DEFAULT_V4_UCHAR(space_outliner.active);
}
/**
* Include next version bump.
*/
{
if (!USER_VERSION_ATLEAST(281, 14)) {
FROM_DEFAULT_V4_UCHAR(space_file.execution_buts);
FROM_DEFAULT_V4_UCHAR(tui.icon_folder);
FROM_DEFAULT_V4_UCHAR(space_clip.path_keyframe_before);
@ -158,6 +155,12 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
copy_v4_v4_uchar(btheme->space_nla.nla_track, btheme->space_nla.header);
}
/**
* Include next version bump.
*/
{
}
#undef FROM_DEFAULT_V4_UCHAR
#undef USER_VERSION_ATLEAST