diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-02-16 08:13:12 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-16 08:30:13 +0300 |
| commit | 9d09eda0a31027c83430718e5caed3797da51b51 (patch) | |
| tree | 7bef8516781636751b2e7309a93532986a583305 /source/blender/blenloader | |
| parent | ae375b4cdc737646b770a722c8a47c22f6992dc4 (diff) | |
DNA: rename theme space types
Follow enum naming convention, use "space_" prefix instead of "t".
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 4 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/versioning_userdef.c | 40 |
2 files changed, 22 insertions, 22 deletions
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 |