blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 760 Projects 19 Wiki Activity

Fix T90412: Inconsistency in mask strip color 

This seems to be oversight in 271231f58e where strip color was
defined only for light theme.
This commit is contained in:
Richard Antalik 2021-11-17 03:27:13 +01:00
parent f72dc00569
commit 61bffa565e
Notes: blender-bot 2023-02-14 03:00:45 +01:00 
Referenced by issue #90412, VSE: Inconsistency in Mask strip color
3 changed files with 5 additions and 2 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

@ -647,7 +647,7 @@ const bTheme U_theme_default = {
.facedot_size = 4,
.movie = RGBA(0x4d6890ff),
.movieclip = RGBA(0x8f4c4cff),
.mask = RGBA(0x666666ff),
.mask = RGBA(0x8f5656ff),
.image = RGBA(0x8f744bff),
.scene = RGBA(0x808033ff),
.audio = RGBA(0x448080ff),

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

@ -39,7 +39,7 @@ extern "C" {
/* Blender file format version. */
#define BLENDER_FILE_VERSION BLENDER_VERSION
#define BLENDER_FILE_SUBVERSION 1
#define BLENDER_FILE_SUBVERSION 2
/* Minimum Blender version that supports reading file written with the current
* version. Older Blender versions will test this and show a warning if the file

3
source/blender/blenloader/intern/versioning_userdef.c
View File

@ -334,6 +334,9 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
memcpy(btheme, &U_theme_default, sizeof(*btheme));
}
if (!USER_VERSION_ATLEAST(301, 2)) {
FROM_DEFAULT_V4_UCHAR(space_sequencer.mask);
}
/**
* Versioning code until next subversion bump goes here.
*