bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Anim: add new keytype 'generated' styling to the Sequencer theme

Browse Source 
Add the color for the new keytype 'generated' to the VSE theme settings
as well.

This includes the versioning code that loads the default from the scene.
Without this, the preference would be initialised to black.

Note that the 'Blender Light' theme does not have any colors for any of
the key types, so I also didn't add the 'generated' type there.

Pull Request: https://projects.blender.org/blender/blender/pulls/123005
This commit is contained in:
Sybren A. Stüvel 2024-06-10 14:17:54 +02:00
parent 1ed2779abc
commit 3089ac97b1
3 changed files with 8 additions and 1 deletions
Show Stats 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),
},

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

@ -29,7 +29,7 @@ extern "C" {
/* Blender file format version. */
#define BLENDER_FILE_VERSION BLENDER_VERSION
#define BLENDER_FILE_SUBVERSION 56
#define BLENDER_FILE_SUBVERSION 57
/* Minimum Blender version that supports reading file written with the current
* version. Older Blender versions will test this and cancel loading the file, showing a warning to

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.