Commit: 9d09eda0a31027c83430718e5caed3797da51b51
Author: Campbell Barton
Date: Sat Feb 16 16:13:12 2019 +1100
Branches: master
https://developer.blender.org/rB9d09eda0a31027c83430718e5caed3797da51b51
DNA: rename theme space types
Follow enum naming convention, use "space_" prefix instead of "t".
===================================================================
M release/datafiles/userdef/userdef_default_theme.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_userdef.c
M source/blender/editors/animation/anim_filter.c
M source/blender/editors/interface/resources.c
M source/blender/makesdna/DNA_userdef_types.h
M source/blender/makesdna/intern/dna_rename_defs.h
M source/blender/makesrna/intern/rna_userdef.c
===================================================================
diff --git a/release/datafiles/userdef/userdef_default_theme.c
b/release/datafiles/userdef/userdef_default_theme.c
index b6ab5ff8375..071be2cfc47 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -252,7 +252,7 @@ const bTheme U_theme_default = {
.icon_modifier = RGBA(0x84b8ffff),
.icon_shading = RGBA(0xff6060ff),
},
- .tbuts = {
+ .space_properties = {
.back = RGBA(0x42424200),
.title = RGBA(0xd4d4d4ff),
.text = RGBA(0xe6e6e6ff),
@@ -278,7 +278,7 @@ const bTheme U_theme_default = {
.outline_width = 1,
.facedot_size = 4,
},
- .tv3d = {
+ .space_view3d = {
.back = RGBA(0x393939ff),
.title = RGBA(0xeeeeeeff),
.text = RGBA(0xe6e6e6ff),
@@ -365,7 +365,7 @@ const bTheme U_theme_default = {
.paint_curve_pivot = RGBA(0xff7f7f7f),
.paint_curve_handle = RGBA(0x7fff7f7f),
},
- .tfile = {
+ .space_file = {
.back = RGBA(0x35353500),
.title = RGBA(0xffffffff),
.text = RGBA(0xe6e6e6ff),
@@ -391,7 +391,7 @@ const bTheme U_theme_default = {
.outline_width = 1,
.facedot_size = 4,
},
- .tipo = {
+ .space_graph = {
.back = RGBA(0x42424200),
.title = RGBA(0xffffffff),
.text = RGBA(0x000000ff),
@@ -442,7 +442,7 @@ const bTheme U_theme_default = {
.handle_vertex_size = 5,
.anim_preview_range = RGBA(0xa14d0066),
},
- .tinfo = {
+ .space_info = {
.back = RGBA(0x42424200),
.title = RGBA(0xeeeeeeff),
.text = RGBA(0xe6e6e6ff),
@@ -476,7 +476,7 @@ const bTheme U_theme_default = {
.info_info_text = RGBA(0xffffffff),
.info_debug = RGBA(0xd3d3d3ff),
},
- .tact = {
+ .space_action = {
.back = RGBA(0x42424200),
.title = RGBA(0xeeeeeeff),
.text = RGBA(0x000000ff),
@@ -533,7 +533,7 @@ const bTheme U_theme_default = {
.anim_active = RGBA(0x4d250066),
.anim_preview_range = RGBA(0xa14d0066),
},
- .tnla = {
+ .space_nla = {
.back = RGBA(0x42424200),
.title = RGBA(0xffffffff),
.text = RGBA(0x000000ff),
@@ -583,7 +583,7 @@ const bTheme U_theme_default = {
.nla_sound = RGBA(0x2b3d3dff),
.nla_sound_sel = RGBA(0x1f7a7aff),
},
- .tseq = {
+ .space_sequencer = {
.back = RGBA(0x42424200),
.title = RGBA(0xeeeeeeff),
.text = RGBA(0x000000ff),
@@ -625,7 +625,7 @@ const bTheme U_theme_default = {
.gp_vertex_select = RGBA(0xff8500ff),
.metadatatext = RGBA(0xffffffff),
},
- .tima = {
+ .space_image = {
.back = RGBA(0x44444400),
.title = RGBA(0xeeeeeeff),
.text = RGBA(0xe6e6e6ff),
@@ -679,7 +679,7 @@ const bTheme U_theme_default = {
.paint_curve_handle = RGBA(0x7fff7f7f),
.metadatatext = RGBA(0xffffffff),
},
- .text = {
+ .space_text = {
.back = RGBA(0x30303000),
.title = RGBA(0xeeeeeeff),
.text = RGBA(0xe6e6e6ff),
@@ -715,7 +715,7 @@ const bTheme U_theme_default = {
.syntaxd = RGBA(0xad80ffff),
.syntaxr = RGBA(0xc4753bff),
},
- .toops = {
+ .space_outliner = {
.back = RGBA(0x28282800),
.title = RGBA(0xffffffff),
.text = RGBA(0xc3c3c3ff),
@@ -742,7 +742,7 @@ const bTheme U_theme_default = {
.match = RGBA(0x337f334c),
.selected_highlight = RGBA(0x314e784c),
},
- .tnode = {
+ .space_node = {
.back = RGBA(0x23232300),
.title = RGBA(0xeeeeeeff),
.text = RGBA(0xe6e6e6ff),
@@ -797,7 +797,7 @@ const bTheme U_theme_default = {
.gp_vertex = RGBA(0x97979700),
.gp_vertex_select = RGBA(0xff8500ff),
},
- .tuserpref = {
+ .space_preferences = {
.back = RGBA(0x42424200),
.title = RGBA(0xeeeeeeff),
.text = RGBA(0xe6e6e6ff),
@@ -824,7 +824,7 @@ const bTheme U_theme_default = {
.outline_width = 1,
.facedot_size = 4,
},
- .tconsole = {
+ .space_console = {
.back = RGBA(0x30303000),
.title = RGBA(0xeeeeeeff),
.text = RGBA(0xe6e6e6ff),
@@ -855,7 +855,7 @@ const bTheme U_theme_default = {
.outline_width = 1,
.facedot_size = 4,
},
- .tclip = {
+ .space_clip = {
.back = RGBA(0x42424200),
.title = RGBA(0xeeeeeeff),
.text = RGBA(0xe6e6e6ff),
@@ -901,7 +901,7 @@ const bTheme U_theme_default = {
.gp_vertex_size = 1,
.metadatatext = RGBA(0xffffffff),
},
- .ttopbar = {
+ .space_topbar = {
.back = RGBA(0x42424200),
.title = RGBA(0xffffffff),
.text = RGBA(0xe6e6e6ff),
@@ -927,7 +927,7 @@ const bTheme U_theme_default = {
.facedot_size = 4,
.gp_vertex_size = 3,
},
- .tstatusbar = {
+ .space_statusbar = {
.back = RGBA(0x2e2e2e00),
.title = RGBA(0xffffffff),
.text = RGBA(0x838383ff),
diff --git a/source/blender/blenloader/intern/readfile.c
b/source/blender/blenloader/intern/readfile.c
index f5c35d9228d..5a91dcf25a7 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -8780,8 +8780,8 @@ static void do_versions_userdef(FileData *fd,
BlendFileData *bfd)
/* themes for Node and Sequence editor were not using grid
color, but back. we copy this over then */
for (btheme = user->themes.first; btheme; btheme =
btheme->next) {
- copy_v4_v4_char(btheme->tnode.grid, btheme->tnode.back);
- copy_v4_v4_char(btheme->tseq.grid, btheme->tseq.back);
+ copy_v4_v4_char(btheme->space_node.grid,
btheme->space_node.back);
+ copy_v4_v4_char(btheme->space_sequencer.grid,
btheme->space_sequencer.back);
}
}
diff --git a/source/blender/blenloader/intern/versioning_userdef.c
b/source/blender/blenloader/intern/versioning_userdef.c
index 38c8808f818..056e91e9882 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -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
diff --git a/source/blender/editors/animation/anim_filter.c
b/source/blender/editors/animation/anim_filter.c
index ca9205cdd47..06f19b8e6ba 100644
--- a/source/blender/editors/animation/anim_filter.c
+++ b/source/blender/editors/animation/anim_filter.c
@@ -111,7 +111,7 @@ static void animedit_get_yscale_factor(bAnimContext *ac)
* NOTE: This theme setting doesn't have an ID, as it cannot be
accessed normally
* since it is a float, and the theme settings methods can only
handle chars.
*/
- ac->yscale_fac = btheme->tact.keyframe_scale_fac;
+ ac->yscale_fac = btheme->space_action.keyframe_scale_fac;
/* clamp to avoid problems with uninitialised values... */
if (ac->yscale_fac < 0.1f)
diff --git a/source/blender/editors/interface/resources.c
b/source/blender/editors/interface/resources.c
index bea8f8aed2b..b13b8a8a8bc 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -109,58 +109,58 @@ const uchar *UI_ThemeGetColorPtr(bTheme *btheme, int
spacetype, int colorid)
switch (spacetype) {
case SPACE_PROPERTIES:
- ts = &btheme->tbuts;
+ ts = &btheme->space_properties;
break;
case SPACE_VIEW3D:
- ts = &btheme->tv3d;
+ ts = &btheme->space_view3d;
break;
case SPACE_IPO:
- ts = &btheme->tipo;
+ ts = &btheme->space_graph;
break;
case SPACE_FILE:
- ts = &btheme->tfile;
+ ts = &btheme->space_file;
break;
case SPACE_NLA:
- ts = &btheme->tnla;
+ ts = &btheme->space_nla;
break;
case SPACE_ACTION:
- ts = &btheme->tact;
+ ts = &btheme->space_action;
break;
case SPACE_SEQ:
-
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
