[Bf-blender-cvs] [b1caab2d738] temp-vse-channels-edge-panning: Revert "Remove unused themes, thought I did this alrready..."
Richard Antalik
noreply at git.blender.org
Thu Mar 24 02:13:20 CET 2022
Commit: b1caab2d738fec850cfc46e49f2938faa9854acd
Author: Richard Antalik
Date: Wed Mar 23 00:58:51 2022 +0100
Branches: temp-vse-channels-edge-panning
https://developer.blender.org/rBb1caab2d738fec850cfc46e49f2938faa9854acd
Revert "Remove unused themes, thought I did this alrready..."
This reverts commit 8a0568f2a8e6f8e236f3379925c2da053bec4902.
===================================================================
M release/datafiles/userdef/userdef_default_theme.c
M source/blender/blenloader/intern/versioning_userdef.c
===================================================================
diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c
index 292080ef629..8114a0574b3 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -665,6 +665,10 @@ const bTheme U_theme_default = {
.row_alternate = RGBA(0xffffff05),
.anim_preview_range = RGBA(0xa14d0066),
.metadatatext = RGBA(0xffffffff),
+ .list = RGBA(0x18181800),
+ .list_title = RGBA(0xffffffff),
+ .list_text = RGBA(0xffffffff),
+ .list_text_hi = RGBA(0xffffffff),
},
.space_image = {
.back = RGBA(0x30303000),
diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c
index f8000dfe896..3d6d9e77c4d 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -325,6 +325,12 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
FROM_DEFAULT_V4_UCHAR(space_sequencer.mask);
}
+ if (!USER_VERSION_ATLEAST(301, 5)) {
+ FROM_DEFAULT_V4_UCHAR(space_sequencer.list);
+ FROM_DEFAULT_V4_UCHAR(space_sequencer.list_title);
+ FROM_DEFAULT_V4_UCHAR(space_sequencer.list_text);
+ FROM_DEFAULT_V4_UCHAR(space_sequencer.list_text_hi);
+ }
/**
* Versioning code until next subversion bump goes here.
*
More information about the Bf-blender-cvs
mailing list