From 3089ac97b1cd74c8a68ed2c7331c645ecf0ca484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Mon, 10 Jun 2024 14:17:54 +0200 Subject: [PATCH] Anim: add new keytype 'generated' styling to the Sequencer theme 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 --- release/datafiles/userdef/userdef_default_theme.c | 2 ++ source/blender/blenkernel/BKE_blender_version.h | 2 +- source/blender/blenloader/intern/versioning_userdef.cc | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c index 83d6698e24b..fb513401b02 100644 --- a/release/datafiles/userdef/userdef_default_theme.c +++ b/release/datafiles/userdef/userdef_default_theme.c @@ -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), }, diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index 2d6b06b7987..01023daf2dd 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -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 diff --git a/source/blender/blenloader/intern/versioning_userdef.cc b/source/blender/blenloader/intern/versioning_userdef.cc index 8e0fcdd53e2..3fa362342b6 100644 --- a/source/blender/blenloader/intern/versioning_userdef.cc +++ b/source/blender/blenloader/intern/versioning_userdef.cc @@ -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.