archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

DNA: rename theme space types

Browse Source 
Follow enum naming convention, use "space_" prefix instead of "t".
This commit is contained in:
Campbell Barton
2019-02-16 16:13:12 +11:00
parent ae375b4cdc
commit 9d09eda0a3
8 changed files with 126 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,9 +54,9 @@ static void do_versions_theme(UserDef *userdef, bTheme *btheme)
copy_v4_v4_char(btheme->member, U_theme_default.member);
if (!USER_VERSION_ATLEAST(280, 25)) {
copy_v4_v4_char(btheme->tact.anim_preview_range, btheme->tact.anim_active);
copy_v4_v4_char(btheme->tnla.anim_preview_range, btheme->tnla.anim_active);
copy_v4_v4_char(btheme->tipo.anim_preview_range, btheme->tact.anim_active);
copy_v4_v4_char(btheme->space_action.anim_preview_range, btheme->space_action.anim_active);
copy_v4_v4_char(btheme->space_nla.anim_preview_range, btheme->space_nla.anim_active);
copy_v4_v4_char(btheme->space_graph.anim_preview_range, btheme->space_action.anim_active);
}
if (!USER_VERSION_ATLEAST(280, 26)) {
@@ -68,26 +68,26 @@ static void do_versions_theme(UserDef *userdef, bTheme *btheme)
}
if (!USER_VERSION_ATLEAST(280, 27)) {
FROM_DEFAULT_V4_UCHAR(tact.shade2);
FROM_DEFAULT_V4_UCHAR(tact.hilite);
FROM_DEFAULT_V4_UCHAR(tact.group);
FROM_DEFAULT_V4_UCHAR(tact.group_active);
FROM_DEFAULT_V4_UCHAR(tact.strip_select);
FROM_DEFAULT_V4_UCHAR(tact.ds_channel);
FROM_DEFAULT_V4_UCHAR(tact.ds_subchannel);
FROM_DEFAULT_V4_UCHAR(tact.keytype_movehold);
FROM_DEFAULT_V4_UCHAR(tact.keytype_movehold_select);
FROM_DEFAULT_V4_UCHAR(space_action.shade2);
FROM_DEFAULT_V4_UCHAR(space_action.hilite);
FROM_DEFAULT_V4_UCHAR(space_action.group);
FROM_DEFAULT_V4_UCHAR(space_action.group_active);
FROM_DEFAULT_V4_UCHAR(space_action.strip_select);
FROM_DEFAULT_V4_UCHAR(space_action.ds_channel);
FROM_DEFAULT_V4_UCHAR(space_action.ds_subchannel);
FROM_DEFAULT_V4_UCHAR(space_action.keytype_movehold);
FROM_DEFAULT_V4_UCHAR(space_action.keytype_movehold_select);
}
if (!USER_VERSION_ATLEAST(280, 28)) {
FROM_DEFAULT_V4_UCHAR(tact.ds_ipoline);
FROM_DEFAULT_V4_UCHAR(space_action.ds_ipoline);
}
if (!USER_VERSION_ATLEAST(280, 29)) {
FROM_DEFAULT_V4_UCHAR(tbuts.navigation_bar);
FROM_DEFAULT_V4_UCHAR(space_properties.navigation_bar);
}
if (!USER_VERSION_ATLEAST(280, 31)) {
FROM_DEFAULT_V4_UCHAR(tclip.list_text);
FROM_DEFAULT_V4_UCHAR(space_clip.list_text);
}
if (!USER_VERSION_ATLEAST(280, 36)) {
@@ -96,17 +96,17 @@ static void do_versions_theme(UserDef *userdef, bTheme *btheme)
}
if (!USER_VERSION_ATLEAST(280, 39)) {
FROM_DEFAULT_V4_UCHAR(tclip.metadatabg);
FROM_DEFAULT_V4_UCHAR(tclip.metadatatext);
FROM_DEFAULT_V4_UCHAR(space_clip.metadatabg);
FROM_DEFAULT_V4_UCHAR(space_clip.metadatatext);
}
if (!USER_VERSION_ATLEAST(280, 40)) {
FROM_DEFAULT_V4_UCHAR(tuserpref.navigation_bar);
copy_v4_v4_char(btheme->tuserpref.execution_buts, btheme->tuserpref.navigation_bar);
FROM_DEFAULT_V4_UCHAR(space_preferences.navigation_bar);
copy_v4_v4_char(btheme->space_preferences.execution_buts, btheme->space_preferences.navigation_bar);
}
if (!USER_VERSION_ATLEAST(280, 41)) {
FROM_DEFAULT_V4_UCHAR(tv3d.back);
FROM_DEFAULT_V4_UCHAR(space_view3d.back);
}
#undef FROM_DEFAULT_V4_UCHAR