griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.2-release'

Browse Source
This commit is contained in:
Campbell Barton
2024-06-21 12:32:54 +10:00
parent bfd999401f 49725106af
commit 00f12c4f41
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -239,7 +239,7 @@ const UserDef U_default = {
.collection_instance_empty_size = 1.0f,
.statusbar_flag = STATUSBAR_SHOW_VERSION,
.statusbar_flag = STATUSBAR_SHOW_VERSION | STATUSBAR_SHOW_EXTENSIONS_UPDATES,
.file_preview_type = USER_FILE_PREVIEW_AUTO,
.sequencer_editor_flag = USER_SEQ_ED_SIMPLE_TWEAKING,

8
source/blender/blenloader/intern/versioning_userdef.cc
View File

@@ -984,10 +984,6 @@ void blo_do_versions_userdef(UserDef *userdef)
}
}
if (!USER_VERSION_ATLEAST(402, 50)) {
userdef->statusbar_flag |= STATUSBAR_SHOW_EXTENSIONS_UPDATES;
}
if (!USER_VERSION_ATLEAST(402, 51)) {
userdef->sequencer_editor_flag |= USER_SEQ_ED_SIMPLE_TWEAKING;
}
@@ -1016,6 +1012,10 @@ void blo_do_versions_userdef(UserDef *userdef)
userdef->network_connection_limit = 5;
}
if (!USER_VERSION_ATLEAST(402, 63)) {
userdef->statusbar_flag |= STATUSBAR_SHOW_EXTENSIONS_UPDATES;
}
/**
* Always bump subversion in BKE_blender_version.h when adding versioning
* code here, and wrap it inside a USER_VERSION_ATLEAST check.