Cleanup: Remove redundant theme versioning code
Since we reset the default theme for the 3.0 release, we don't need to keep these version patches around anymore. Ref D13131
This commit is contained in:
parent
33fc230ba2
commit
f9076f3869
|
@ -55,259 +55,6 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
|
|||
#define USER_VERSION_ATLEAST(ver, subver) MAIN_VERSION_ATLEAST(userdef, ver, subver)
|
||||
#define FROM_DEFAULT_V4_UCHAR(member) copy_v4_v4_uchar(btheme->member, U_theme_default.member)
|
||||
|
||||
if (!USER_VERSION_ATLEAST(280, 25)) {
|
||||
copy_v4_v4_uchar(btheme->space_action.anim_preview_range, btheme->space_action.anim_active);
|
||||
copy_v4_v4_uchar(btheme->space_nla.anim_preview_range, btheme->space_nla.anim_active);
|
||||
copy_v4_v4_uchar(btheme->space_graph.anim_preview_range, btheme->space_action.anim_active);
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(280, 26)) {
|
||||
FROM_DEFAULT_V4_UCHAR(tui.icon_collection);
|
||||
FROM_DEFAULT_V4_UCHAR(tui.icon_object);
|
||||
FROM_DEFAULT_V4_UCHAR(tui.icon_object_data);
|
||||
FROM_DEFAULT_V4_UCHAR(tui.icon_modifier);
|
||||
FROM_DEFAULT_V4_UCHAR(tui.icon_shading);
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(280, 27)) {
|
||||
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(space_action.ds_ipoline);
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(280, 29)) {
|
||||
FROM_DEFAULT_V4_UCHAR(space_properties.navigation_bar);
|
||||
}
|
||||
if (!USER_VERSION_ATLEAST(280, 31)) {
|
||||
FROM_DEFAULT_V4_UCHAR(space_clip.list_text);
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(280, 36)) {
|
||||
FROM_DEFAULT_V4_UCHAR(tui.wcol_state.inner_changed);
|
||||
FROM_DEFAULT_V4_UCHAR(tui.wcol_state.inner_changed_sel);
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(280, 39)) {
|
||||
FROM_DEFAULT_V4_UCHAR(space_clip.metadatabg);
|
||||
FROM_DEFAULT_V4_UCHAR(space_clip.metadatatext);
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(280, 40)) {
|
||||
FROM_DEFAULT_V4_UCHAR(space_preferences.navigation_bar);
|
||||
copy_v4_v4_uchar(btheme->space_preferences.execution_buts,
|
||||
btheme->space_preferences.navigation_bar);
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(280, 41)) {
|
||||
FROM_DEFAULT_V4_UCHAR(space_view3d.back);
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(280, 52)) {
|
||||
FROM_DEFAULT_V4_UCHAR(space_info.info_info);
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(280, 64)) {
|
||||
FROM_DEFAULT_V4_UCHAR(tui.icon_scene);
|
||||
|
||||
if (btheme->space_view3d.obcenter_dia == 0) {
|
||||
btheme->space_view3d.obcenter_dia = U_theme_default.space_view3d.obcenter_dia;
|
||||
}
|
||||
|
||||
FROM_DEFAULT_V4_UCHAR(space_graph.text);
|
||||
FROM_DEFAULT_V4_UCHAR(space_action.text);
|
||||
FROM_DEFAULT_V4_UCHAR(space_nla.text);
|
||||
FROM_DEFAULT_V4_UCHAR(space_sequencer.text);
|
||||
FROM_DEFAULT_V4_UCHAR(space_clip.text);
|
||||
|
||||
FROM_DEFAULT_V4_UCHAR(space_graph.time_scrub_background);
|
||||
FROM_DEFAULT_V4_UCHAR(space_action.time_scrub_background);
|
||||
FROM_DEFAULT_V4_UCHAR(space_nla.time_scrub_background);
|
||||
FROM_DEFAULT_V4_UCHAR(space_sequencer.time_scrub_background);
|
||||
FROM_DEFAULT_V4_UCHAR(space_clip.time_scrub_background);
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(280, 67)) {
|
||||
FROM_DEFAULT_V4_UCHAR(space_outliner.selected_object);
|
||||
FROM_DEFAULT_V4_UCHAR(space_outliner.active_object);
|
||||
FROM_DEFAULT_V4_UCHAR(space_outliner.edited_object);
|
||||
FROM_DEFAULT_V4_UCHAR(space_outliner.row_alternate);
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(281, 3)) {
|
||||
FROM_DEFAULT_V4_UCHAR(space_outliner.selected_highlight);
|
||||
FROM_DEFAULT_V4_UCHAR(space_outliner.active);
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(281, 14)) {
|
||||
FROM_DEFAULT_V4_UCHAR(space_file.execution_buts);
|
||||
FROM_DEFAULT_V4_UCHAR(tui.icon_folder);
|
||||
FROM_DEFAULT_V4_UCHAR(space_clip.path_keyframe_before);
|
||||
FROM_DEFAULT_V4_UCHAR(space_clip.path_keyframe_after);
|
||||
copy_v4_v4_uchar(btheme->space_nla.nla_track, btheme->space_nla.header);
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(282, 5)) {
|
||||
FROM_DEFAULT_V4_UCHAR(space_sequencer.anim_preview_range);
|
||||
FROM_DEFAULT_V4_UCHAR(space_text.line_numbers);
|
||||
FROM_DEFAULT_V4_UCHAR(tui.widget_text_cursor);
|
||||
FROM_DEFAULT_V4_UCHAR(space_view3d.face_back);
|
||||
FROM_DEFAULT_V4_UCHAR(space_view3d.face_front);
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(283, 1)) {
|
||||
FROM_DEFAULT_V4_UCHAR(space_view3d.bone_locked_weight);
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(283, 2)) {
|
||||
FROM_DEFAULT_V4_UCHAR(space_info.info_property);
|
||||
FROM_DEFAULT_V4_UCHAR(space_info.info_property_text);
|
||||
FROM_DEFAULT_V4_UCHAR(space_info.info_operator);
|
||||
FROM_DEFAULT_V4_UCHAR(space_info.info_operator_text);
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(283, 5)) {
|
||||
FROM_DEFAULT_V4_UCHAR(space_graph.time_marker_line);
|
||||
FROM_DEFAULT_V4_UCHAR(space_action.time_marker_line);
|
||||
FROM_DEFAULT_V4_UCHAR(space_nla.time_marker_line);
|
||||
FROM_DEFAULT_V4_UCHAR(space_sequencer.time_marker_line);
|
||||
FROM_DEFAULT_V4_UCHAR(space_clip.time_marker_line);
|
||||
FROM_DEFAULT_V4_UCHAR(space_graph.time_marker_line_selected);
|
||||
FROM_DEFAULT_V4_UCHAR(space_action.time_marker_line_selected);
|
||||
FROM_DEFAULT_V4_UCHAR(space_nla.time_marker_line_selected);
|
||||
FROM_DEFAULT_V4_UCHAR(space_sequencer.time_marker_line_selected);
|
||||
FROM_DEFAULT_V4_UCHAR(space_clip.time_marker_line_selected);
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(283, 6)) {
|
||||
btheme->space_node.grid_levels = U_theme_default.space_node.grid_levels;
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(283, 9)) {
|
||||
FROM_DEFAULT_V4_UCHAR(space_info.info_warning);
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(283, 10)) {
|
||||
FROM_DEFAULT_V4_UCHAR(tui.gizmo_view_align);
|
||||
|
||||
FROM_DEFAULT_V4_UCHAR(space_sequencer.active_strip);
|
||||
FROM_DEFAULT_V4_UCHAR(space_sequencer.selected_strip);
|
||||
FROM_DEFAULT_V4_UCHAR(space_sequencer.color_strip);
|
||||
FROM_DEFAULT_V4_UCHAR(space_sequencer.mask);
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(283, 11)) {
|
||||
FROM_DEFAULT_V4_UCHAR(tui.transparent_checker_primary);
|
||||
FROM_DEFAULT_V4_UCHAR(tui.transparent_checker_secondary);
|
||||
btheme->tui.transparent_checker_size = U_theme_default.tui.transparent_checker_size;
|
||||
}
|
||||
if (!USER_VERSION_ATLEAST(291, 2)) {
|
||||
/* The new defaults for the file browser theme are the same as
|
||||
* the outliner's, and it's less disruptive to just copy them. */
|
||||
copy_v4_v4_uchar(btheme->space_file.back, btheme->space_outliner.back);
|
||||
copy_v4_v4_uchar(btheme->space_file.row_alternate, btheme->space_outliner.row_alternate);
|
||||
|
||||
FROM_DEFAULT_V4_UCHAR(space_image.grid);
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(291, 3)) {
|
||||
for (int i = 0; i < COLLECTION_COLOR_TOT; ++i) {
|
||||
FROM_DEFAULT_V4_UCHAR(collection_color[i].color);
|
||||
}
|
||||
|
||||
FROM_DEFAULT_V4_UCHAR(space_properties.match);
|
||||
|
||||
/* New grid theme color defaults are the same as the existing background colors,
|
||||
* so they are copied to limit disruption. */
|
||||
copy_v3_v3_uchar(btheme->space_clip.grid, btheme->space_clip.back);
|
||||
btheme->space_clip.grid[3] = 255.0f;
|
||||
|
||||
copy_v3_v3_uchar(btheme->space_node.grid, btheme->space_node.back);
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(291, 9)) {
|
||||
FROM_DEFAULT_V4_UCHAR(space_graph.vertex_active);
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(292, 5)) {
|
||||
for (int i = 0; i < COLLECTION_COLOR_TOT; ++i) {
|
||||
FROM_DEFAULT_V4_UCHAR(collection_color[i].color);
|
||||
}
|
||||
FROM_DEFAULT_V4_UCHAR(space_sequencer.row_alternate);
|
||||
FROM_DEFAULT_V4_UCHAR(space_node.nodeclass_geometry);
|
||||
FROM_DEFAULT_V4_UCHAR(space_node.nodeclass_attribute);
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(292, 12)) {
|
||||
FROM_DEFAULT_V4_UCHAR(space_node.nodeclass_shader);
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(293, 15)) {
|
||||
FROM_DEFAULT_V4_UCHAR(space_properties.active);
|
||||
|
||||
FROM_DEFAULT_V4_UCHAR(space_info.info_error);
|
||||
FROM_DEFAULT_V4_UCHAR(space_info.info_warning);
|
||||
FROM_DEFAULT_V4_UCHAR(space_info.info_info);
|
||||
FROM_DEFAULT_V4_UCHAR(space_info.info_debug);
|
||||
FROM_DEFAULT_V4_UCHAR(space_info.info_debug_text);
|
||||
FROM_DEFAULT_V4_UCHAR(space_info.info_property);
|
||||
FROM_DEFAULT_V4_UCHAR(space_info.info_error);
|
||||
FROM_DEFAULT_V4_UCHAR(space_info.info_operator);
|
||||
|
||||
btheme->space_spreadsheet = btheme->space_outliner;
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(300, 5)) {
|
||||
FROM_DEFAULT_V4_UCHAR(space_spreadsheet.active);
|
||||
FROM_DEFAULT_V4_UCHAR(space_spreadsheet.list);
|
||||
FROM_DEFAULT_V4_UCHAR(space_spreadsheet.list_text);
|
||||
FROM_DEFAULT_V4_UCHAR(space_spreadsheet.list_text_hi);
|
||||
FROM_DEFAULT_V4_UCHAR(space_spreadsheet.hilite);
|
||||
FROM_DEFAULT_V4_UCHAR(space_spreadsheet.selected_highlight);
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(300, 15)) {
|
||||
copy_v4_uchar(btheme->space_sequencer.grid, 33);
|
||||
btheme->space_sequencer.grid[3] = 255;
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(300, 30)) {
|
||||
FROM_DEFAULT_V4_UCHAR(space_node.wire);
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(300, 31)) {
|
||||
for (int i = 0; i < SEQUENCE_COLOR_TOT; ++i) {
|
||||
FROM_DEFAULT_V4_UCHAR(strip_color[i].color);
|
||||
}
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(300, 33)) {
|
||||
/* Adjust the frame node alpha now that it is used differently. */
|
||||
btheme->space_node.movie[3] = U_theme_default.space_node.movie[3];
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(300, 34)) {
|
||||
btheme->tui.panel_roundness = 0.4f;
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(300, 37)) {
|
||||
btheme->space_node.dash_alpha = 0.5f;
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(300, 39)) {
|
||||
FROM_DEFAULT_V4_UCHAR(space_node.grid);
|
||||
btheme->space_node.grid_levels = 7;
|
||||
}
|
||||
|
||||
if (!USER_VERSION_ATLEAST(300, 41)) {
|
||||
memcpy(btheme, &U_theme_default, sizeof(*btheme));
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue