forked from bartvdbraak/blender
Fix T90412: Inconsistency in mask strip color
This seems to be oversight in 271231f58ee3 where strip color was defined only for light theme.
This commit is contained in:
parent
f72dc00569
commit
61bffa565e
@ -647,7 +647,7 @@ const bTheme U_theme_default = {
|
|||||||
.facedot_size = 4,
|
.facedot_size = 4,
|
||||||
.movie = RGBA(0x4d6890ff),
|
.movie = RGBA(0x4d6890ff),
|
||||||
.movieclip = RGBA(0x8f4c4cff),
|
.movieclip = RGBA(0x8f4c4cff),
|
||||||
.mask = RGBA(0x666666ff),
|
.mask = RGBA(0x8f5656ff),
|
||||||
.image = RGBA(0x8f744bff),
|
.image = RGBA(0x8f744bff),
|
||||||
.scene = RGBA(0x808033ff),
|
.scene = RGBA(0x808033ff),
|
||||||
.audio = RGBA(0x448080ff),
|
.audio = RGBA(0x448080ff),
|
||||||
|
@ -39,7 +39,7 @@ extern "C" {
|
|||||||
|
|
||||||
/* Blender file format version. */
|
/* Blender file format version. */
|
||||||
#define BLENDER_FILE_VERSION BLENDER_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
|
/* 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
|
* version. Older Blender versions will test this and show a warning if the file
|
||||||
|
@ -334,6 +334,9 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
|
|||||||
memcpy(btheme, &U_theme_default, sizeof(*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.
|
* Versioning code until next subversion bump goes here.
|
||||||
*
|
*
|
||||||
|
Loading…
Reference in New Issue
Block a user