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

Merge remote-tracking branch 'origin/blender-v4.2-release'

Browse Source 
This is just a merge, a version bump is still necessary. Will do that in
a subsequent commit.
This commit is contained in:
Sybren A. Stüvel
2024-06-10 15:51:28 +02:00
parent 4b3b4a9d8b 3089ac97b1
commit e566dc3c3c
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -686,11 +686,13 @@ const bTheme U_theme_default = {
.keytype_breakdown = RGBA(0xb3dbe8ff),
.keytype_jitter = RGBA(0x94e575ff),
.keytype_movehold = RGBA(0x808080ff),
.keytype_generated = RGBA(0x585858ff),
.keytype_keyframe_select = RGBA(0xffbe33ff),
.keytype_extreme_select = RGBA(0xf28080ff),
.keytype_breakdown_select = RGBA(0x54bfedff),
.keytype_jitter_select = RGBA(0x61c042ff),
.keytype_movehold_select = RGBA(0xffaf23ff),
.keytype_generated_select = RGBA(0xa28962ff),
.keyborder = RGBA(0x000000ff),
.keyborder_select = RGBA(0x000000ff),
},

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

@@ -164,6 +164,11 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
FROM_DEFAULT_V4_UCHAR(space_view3d.time_gp_keyframe);
}
if (!USER_VERSION_ATLEAST(402, 57)) {
FROM_DEFAULT_V4_UCHAR(space_sequencer.keytype_generated);
FROM_DEFAULT_V4_UCHAR(space_sequencer.keytype_generated_select);
}
/**
* Always bump subversion in BKE_blender_version.h when adding versioning
* code here, and wrap it inside a USER_VERSION_ATLEAST check.