From abb233dd1e41387ec3eb84d63f3742e4830a05ee Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Thu, 20 Jun 2024 20:22:12 +0200 Subject: [PATCH] VSE: Update theme colors for strips MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some of the existing colors were hard to read with the new strips design. Tried following the concept from 2.83 redesign rationale: * Same saturation for regular strips. * Lower saturation for effect strips. * Tried to reduce the hue shift between certain similar effects. Other changes: * Match saturation of all regular strips. * Reduce value and saturation (mostly value) of color tags so they are readable in both light and dark text. * Image: Follow node editor Image node socket color. * Color: Use the same hue as the color node socket. * Text: Change it so it doesn’t use the same as Image. * Sound: Use a greener color, less movie-like blue. * Scene: Light gray, similar fashion to Collections. * Other strips had minor adjustments. Images and details in the pull request. Pull Request: https://projects.blender.org/blender/blender/pulls/123446 --- .../datafiles/userdef/userdef_default_theme.c | 36 +++++++++---------- .../blender/blenkernel/BKE_blender_version.h | 2 +- .../blenloader/intern/versioning_userdef.cc | 14 ++++++++ .../sequencer_timeline_draw.cc | 20 +++++------ 4 files changed, 43 insertions(+), 29 deletions(-) diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c index fb513401b02..98582d21445 100644 --- a/release/datafiles/userdef/userdef_default_theme.c +++ b/release/datafiles/userdef/userdef_default_theme.c @@ -663,17 +663,6 @@ const bTheme U_theme_default = { .vertex_size = 3, .outline_width = 1, .facedot_size = 4, - .movie = RGBA(0x4d6890ff), - .movieclip = RGBA(0x8f4c4cff), - .mask = RGBA(0x8f5656ff), - .image = RGBA(0x8f744bff), - .scene = RGBA(0x808033ff), - .audio = RGBA(0x448080ff), - .effect = RGBA(0x514a73ff), - .transition = RGBA(0x50458fff), - .meta = RGBA(0x5b4d91ff), - .text_strip = RGBA(0x824c8fff), - .color_strip = RGBA(0x8f8f8fff), .active_strip = RGBA(0xffffffff), .selected_strip = RGBA(0xff8f0dff), .gp_vertex_size = 3, @@ -695,6 +684,17 @@ const bTheme U_theme_default = { .keytype_generated_select = RGBA(0xa28962ff), .keyborder = RGBA(0x000000ff), .keyborder_select = RGBA(0x000000ff), + .movie = RGBA(0x6282a3ff), + .movieclip = RGBA(0x8f6e56ff), + .mask = RGBA(0x8f5656ff), + .image = RGBA(0x8c548cff), + .scene = RGBA(0x999999ff), + .audio = RGBA(0x568f6dff), + .effect = RGBA(0x7b5f80ff), + .transition = RGBA(0x867accff), + .meta = RGBA(0x7b995cff), + .text_strip = RGBA(0x9f926fff), + .color_strip = RGBA(0x99995cff), }, .space_image = { .back = RGBA(0x30303000), @@ -1236,19 +1236,19 @@ const bTheme U_theme_default = { }, .strip_color = { { - .color = RGBA(0xe2605bff), + .color = RGBA(0xcc5a52ff), }, { - .color = RGBA(0xf1a355ff), + .color = RGBA(0xcc8a48ff), }, { - .color = RGBA(0xf1dc55ff), + .color = RGBA(0xb3a33fff), }, { - .color = RGBA(0x7bcc7bff), + .color = RGBA(0x5c995cff), }, { - .color = RGBA(0x5db6eaff), + .color = RGBA(0x519fccff), }, { .color = RGBA(0x8d59daff), @@ -1257,10 +1257,10 @@ const bTheme U_theme_default = { .color = RGBA(0xc673b8ff), }, { - .color = RGBA(0x7a5441ff), + .color = RGBA(0x996952ff), }, { - .color = RGBA(0x5f5f5fff), + .color = RGBA(0x808080ff), }, }, }; diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index ce49ac0edcc..7642f85ebe1 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 61 +#define BLENDER_FILE_SUBVERSION 62 /* 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 7351e7d7336..1cdb97e3767 100644 --- a/source/blender/blenloader/intern/versioning_userdef.cc +++ b/source/blender/blenloader/intern/versioning_userdef.cc @@ -169,6 +169,20 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme) FROM_DEFAULT_V4_UCHAR(space_sequencer.keytype_generated_select); } + if (!USER_VERSION_ATLEAST(402, 62)) { + FROM_DEFAULT_V4_UCHAR(space_sequencer.audio); + FROM_DEFAULT_V4_UCHAR(space_sequencer.color_strip); + FROM_DEFAULT_V4_UCHAR(space_sequencer.effect); + FROM_DEFAULT_V4_UCHAR(space_sequencer.image); + FROM_DEFAULT_V4_UCHAR(space_sequencer.mask); + FROM_DEFAULT_V4_UCHAR(space_sequencer.meta); + FROM_DEFAULT_V4_UCHAR(space_sequencer.movie); + FROM_DEFAULT_V4_UCHAR(space_sequencer.movieclip); + FROM_DEFAULT_V4_UCHAR(space_sequencer.scene); + FROM_DEFAULT_V4_UCHAR(space_sequencer.text_strip); + FROM_DEFAULT_V4_UCHAR(space_sequencer.transition); + } + /** * Always bump subversion in BKE_blender_version.h when adding versioning * code here, and wrap it inside a USER_VERSION_ATLEAST check. diff --git a/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc b/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc index b7b6677709f..7f2f91cc9c4 100644 --- a/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc +++ b/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc @@ -365,37 +365,37 @@ static void color3ubv_from_seq(const Scene *curscene, /* Slightly offset hue to distinguish different effects. */ if (seq->type == SEQ_TYPE_ADD) { - rgb_byte_set_hue_float_offset(r_col, 0.03); + rgb_byte_set_hue_float_offset(r_col, 0.09); } else if (seq->type == SEQ_TYPE_SUB) { - rgb_byte_set_hue_float_offset(r_col, 0.06); + rgb_byte_set_hue_float_offset(r_col, 0.03); } else if (seq->type == SEQ_TYPE_MUL) { - rgb_byte_set_hue_float_offset(r_col, 0.13); + rgb_byte_set_hue_float_offset(r_col, 0.06); } else if (seq->type == SEQ_TYPE_ALPHAOVER) { rgb_byte_set_hue_float_offset(r_col, 0.16); } else if (seq->type == SEQ_TYPE_ALPHAUNDER) { - rgb_byte_set_hue_float_offset(r_col, 0.23); + rgb_byte_set_hue_float_offset(r_col, 0.19); } else if (seq->type == SEQ_TYPE_OVERDROP) { - rgb_byte_set_hue_float_offset(r_col, 0.26); + rgb_byte_set_hue_float_offset(r_col, 0.22); } else if (seq->type == SEQ_TYPE_COLORMIX) { - rgb_byte_set_hue_float_offset(r_col, 0.33); + rgb_byte_set_hue_float_offset(r_col, 0.25); } else if (seq->type == SEQ_TYPE_GAUSSIAN_BLUR) { - rgb_byte_set_hue_float_offset(r_col, 0.43); + rgb_byte_set_hue_float_offset(r_col, 0.31); } else if (seq->type == SEQ_TYPE_GLOW) { - rgb_byte_set_hue_float_offset(r_col, 0.46); + rgb_byte_set_hue_float_offset(r_col, 0.34); } else if (seq->type == SEQ_TYPE_ADJUSTMENT) { - rgb_byte_set_hue_float_offset(r_col, 0.55); + rgb_byte_set_hue_float_offset(r_col, 0.89); } else if (seq->type == SEQ_TYPE_SPEED) { - rgb_byte_set_hue_float_offset(r_col, 0.65); + rgb_byte_set_hue_float_offset(r_col, 0.72); } else if (seq->type == SEQ_TYPE_TRANSFORM) { rgb_byte_set_hue_float_offset(r_col, 0.75);