[Bf-blender-cvs] [f4f85b9db72] blender2.8: Cleanup: remove redundant theme colors

Campbell Barton noreply at git.blender.org
Mon Jul 2 16:36:02 CEST 2018


Commit: f4f85b9db72255dd985f7adabc955236119e4a39
Author: Campbell Barton
Date:   Mon Jul 2 16:34:47 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBf4f85b9db72255dd985f7adabc955236119e4a39

Cleanup: remove redundant theme colors

Remove unused colors (colors which RNA has no access to).

===================================================================

M	release/datafiles/userdef/userdef_default_theme.c

===================================================================

diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c
index 76023edca50..6fc55f07a91 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -229,9 +229,6 @@ const bTheme U_theme_default = {
 			.inner_driven_sel = RGBA(0x9900e6ff),
 			.blend = 0.5f,
 		},
-		.panel = {
-			.back = RGBA(0x72727280),
-		},
 		.widget_emboss = RGBA(0x00000005),
 		.menu_shadow_fac = 0.3f,
 		.menu_shadow_width = 4,
@@ -253,7 +250,6 @@ const bTheme U_theme_default = {
 		.text = RGBA(0xffffffff),
 		.text_hi = RGBA(0xffffffff),
 		.header = RGBA(0x3a3c42ff),
-		.header_title = RGBA(0x000000ff),
 		.header_text = RGBA(0xeeeeeeff),
 		.header_text_hi = RGBA(0xffffffff),
 		.tab_active = RGBA(0x43444bff),
@@ -264,10 +260,6 @@ const bTheme U_theme_default = {
 		.button_title = RGBA(0xffffffff),
 		.button_text = RGBA(0xffffffff),
 		.button_text_hi = RGBA(0xffffffff),
-		.list = RGBA(0xa5a5a5ff),
-		.list_title = RGBA(0x000000ff),
-		.list_text = RGBA(0x000000ff),
-		.list_text_hi = RGBA(0xffffffff),
 		.panelcolors = {
 			.header = RGBA(0x3a3c42cc),
 			.back = RGBA(0x2c2e33b3),
@@ -275,66 +267,15 @@ const bTheme U_theme_default = {
 			.show_header = 1,
 			.show_back = 1,
 		},
-		.shade2 = RGBA(0x7f707064),
-		.grid = RGBA(0x404040ff),
-		.wire = RGBA(0x000000ff),
-		.select = RGBA(0xf15800ff),
-		.lamp = RGBA(0x00000028),
-		.speaker = RGBA(0x000000ff),
-		.empty = RGBA(0x000000ff),
-		.camera = RGBA(0x000000ff),
-		.active = RGBA(0xffaa40ff),
-		.group = RGBA(0x083008ff),
-		.group_active = RGBA(0x55bb55ff),
-		.transform = RGBA(0xffffffff),
-		.vertex = RGBA(0x000000ff),
-		.vertex_select = RGBA(0xff8500ff),
-		.edge = RGBA(0x000000ff),
-		.edge_select = RGBA(0xffa000ff),
-		.edge_seam = RGBA(0xdb2512ff),
-		.edge_sharp = RGBA(0x00ffffff),
-		.edge_facesel = RGBA(0x4b4b4bff),
-		.edge_crease = RGBA(0xcc0099ff),
-		.face = RGBA(0x00000012),
-		.face_select = RGBA(0xff85003c),
-		.face_dot = RGBA(0xff8500ff),
-		.extra_edge_len = RGBA(0x200000ff),
-		.extra_face_angle = RGBA(0x000080ff),
-		.extra_face_area = RGBA(0x002000ff),
-		.normal = RGBA(0x22ddddff),
-		.vertex_normal = RGBA(0x2361ddff),
-		.bone_solid = RGBA(0xc8c8c8ff),
-		.bone_pose = RGBA(0x50c8ff50),
-		.bone_pose_active = RGBA(0x8cffff50),
-		.cframe = RGBA(0x60c040ff),
-		.nurb_uline = RGBA(0x909000ff),
-		.nurb_vline = RGBA(0x803060ff),
-		.act_spline = RGBA(0xdb2512ff),
-		.nurb_sel_uline = RGBA(0xf0ff40ff),
-		.nurb_sel_vline = RGBA(0xf090a0ff),
-		.lastsel_point = RGBA(0xffffffff),
-		.handle_free = RGBA(0x000000ff),
-		.handle_auto = RGBA(0x909000ff),
-		.handle_vect = RGBA(0x409030ff),
-		.handle_align = RGBA(0x803060ff),
-		.handle_sel_free = RGBA(0x000000ff),
-		.handle_sel_auto = RGBA(0xf0ff40ff),
-		.handle_sel_vect = RGBA(0x40c030ff),
-		.handle_sel_align = RGBA(0xf090a0ff),
 		.vertex_size = 3,
 		.outline_width = 1,
 		.facedot_size = 4,
-		.editmesh_active = RGBA(0xffffff80),
-		.bundle_solid = RGBA(0xc8c8c8ff),
-		.camera_path = RGBA(0x000000ff),
-		.skin_root = RGBA(0xb44d4dff),
 	},
 	.tv3d = {
 		.title = RGBA(0xeeeeeeff),
 		.text = RGBA(0xffffffff),
 		.text_hi = RGBA(0xffffffff),
 		.header = RGBA(0x3a3c4200),
-		.header_title = RGBA(0x000000ff),
 		.header_text = RGBA(0xeeeeeeff),
 		.header_text_hi = RGBA(0xffffffff),
 		.tab_active = RGBA(0x43444bff),
@@ -345,10 +286,6 @@ const bTheme U_theme_default = {
 		.button_title = RGBA(0xffffffff),
 		.button_text = RGBA(0xffffffff),
 		.button_text_hi = RGBA(0xffffffff),
-		.list = RGBA(0xa5a5a5ff),
-		.list_title = RGBA(0x000000ff),
-		.list_text = RGBA(0x000000ff),
-		.list_text_hi = RGBA(0xffffffff),
 		.panelcolors = {
 			.header = RGBA(0x3a3c42cc),
 			.back = RGBA(0x2c2e33b3),
@@ -361,24 +298,18 @@ const bTheme U_theme_default = {
 			.high_gradient = RGBA(0x474748ff),
 			.show_grad = 1,
 		},
-		.shade2 = RGBA(0x7f707064),
 		.grid = RGBA(0x1f1f23ff),
 		.view_overlay = RGBA(0x80808000),
-		.wire = RGBA(0x000000ff),
-		.wire_edit = RGBA(0x111111ff),
-		.select = RGBA(0xed5700ff),
+		.wire_edit = RGBA(0x11111100),
+		.select = RGBA(0xed570000),
 		.lamp = RGBA(0x9f986e33),
 		.speaker = RGBA(0xb6b6b6ff),
 		.empty = RGBA(0xb6b6b6ff),
 		.camera = RGBA(0xd9d9d9ff),
 		.active = RGBA(0xffa028ff),
-		.group = RGBA(0x083008ff),
-		.group_active = RGBA(0x55bb55ff),
 		.transform = RGBA(0xffffffff),
-		.vertex = RGBA(0x000000ff),
 		.vertex_select = RGBA(0xff8500ff),
 		.vertex_bevel = RGBA(0x00a5ffff),
-		.edge = RGBA(0x000000ff),
 		.edge_select = RGBA(0xffa000ff),
 		.edge_seam = RGBA(0xdb2512ff),
 		.edge_sharp = RGBA(0x00ffffff),
@@ -389,7 +320,7 @@ const bTheme U_theme_default = {
 		.face_select = RGBA(0xff85004d),
 		.face_dot = RGBA(0xff8500ff),
 		.extra_edge_len = RGBA(0x150806ff),
-		.extra_edge_angle = RGBA(0x4d4d0000),
+		.extra_edge_angle = RGBA(0x4d4d00ff),
 		.extra_face_angle = RGBA(0x0000ccff),
 		.extra_face_area = RGBA(0x004d00ff),
 		.normal = RGBA(0x22ddddff),
@@ -409,11 +340,9 @@ const bTheme U_theme_default = {
 		.nurb_sel_uline = RGBA(0xf0ff40ff),
 		.nurb_sel_vline = RGBA(0xf090a0ff),
 		.lastsel_point = RGBA(0xffffffff),
-		.handle_free = RGBA(0x000000ff),
 		.handle_auto = RGBA(0x909000ff),
 		.handle_vect = RGBA(0x409030ff),
 		.handle_align = RGBA(0x803060ff),
-		.handle_sel_free = RGBA(0x000000ff),
 		.handle_sel_auto = RGBA(0xf0ff40ff),
 		.handle_sel_vect = RGBA(0x40c030ff),
 		.handle_sel_align = RGBA(0xf090a0ff),
@@ -423,9 +352,7 @@ const bTheme U_theme_default = {
 		.editmesh_active = RGBA(0xffffff80),
 		.clipping_border_3d = RGBA(0x313131ff),
 		.bundle_solid = RGBA(0xc8c8c8ff),
-		.camera_path = RGBA(0x000000ff),
 		.gp_vertex_size = 3,
-		.gp_vertex = RGBA(0x000000ff),
 		.gp_vertex_select = RGBA(0xff8500ff),
 		.skin_root = RGBA(0xb44d4dff),
 		.paint_curve_pivot = RGBA(0xff7f7f7f),
@@ -437,8 +364,7 @@ const bTheme U_theme_default = {
 		.text = RGBA(0xffffffff),
 		.text_hi = RGBA(0xffffffff),
 		.header = RGBA(0x29282eff),
-		.header_title = RGBA(0x000000ff),
-		.header_text = RGBA(0xeeeeeeff),
+		.header_text = RGBA(0xeeeeee00),
 		.header_text_hi = RGBA(0xffffffff),
 		.tab_active = RGBA(0x43444bff),
 		.tab_inactive = RGBA(0x323239ff),
@@ -448,10 +374,6 @@ const bTheme U_theme_default = {
 		.button_title = RGBA(0xffffffff),
 		.button_text = RGBA(0xffffffff),
 		.button_text_hi = RGBA(0xffffffff),
-		.list = RGBA(0x666666ff),
-		.list_title = RGBA(0x000000ff),
-		.list_text = RGBA(0x000000ff),
-		.list_text_hi = RGBA(0xffffffff),
 		.panelcolors = {
 			.header = RGBA(0x3a3c42cc),
 			.back = RGBA(0x2c2e33b3),
@@ -459,63 +381,10 @@ const bTheme U_theme_default = {
 			.show_header = 1,
 			.show_back = 1,
 		},
-		.shade2 = RGBA(0x7f707064),
 		.hilite = RGBA(0x5b8199ff),
-		.grid = RGBA(0xfafafaff),
-		.wire = RGBA(0x000000ff),
-		.select = RGBA(0xf15800ff),
-		.lamp = RGBA(0x00000028),
-		.speaker = RGBA(0x000000ff),
-		.empty = RGBA(0x000000ff),
-		.camera = RGBA(0x000000ff),
-		.active = RGBA(0x828282ff),
-		.group = RGBA(0x083008ff),
-		.group_active = RGBA(0x55bb55ff),
-		.transform = RGBA(0xffffffff),
-		.vertex = RGBA(0x000000ff),
-		.vertex_select = RGBA(0xff8500ff),
-		.edge = RGBA(0x000000ff),
-		.edge_select = RGBA(0xffa000ff),
-		.edge_seam = RGBA(0xdb2512ff),
-		.edge_sharp = RGBA(0x00ffffff),
-		.edge_facesel = RGBA(0x4b4b4bff),
-		.edge_crease = RGBA(0xcc0099ff),
-		.face = RGBA(0x00000012),
-		.face_select = RGBA(0xff85003c),
-		.face_dot = RGBA(0xff8500ff),
-		.extra_edge_len = RGBA(0x200000ff),
-		.extra_face_angle = RGBA(0x000080ff),
-		.extra_face_area = RGBA(0x002000ff),
-		.normal = RGBA(0x22ddddff),
-		.vertex_normal = RGBA(0x2361ddff),
-		.bone_solid = RGBA(0xc8c8c8ff),
-		.bone_pose = RGBA(0x50c8ff50),
-		.bone_pose_active = RGBA(0x8cffff50),
-		.cframe = RGBA(0x60c040ff),
-		.nurb_uline = RGBA(0x909000ff),
-		.nurb_vline = RGBA(0x803060ff),
-		.act_spline = RGBA(0xdb2512ff),
-		.nurb_sel_uline = RGBA(0xf0ff40ff),
-		.nurb_sel_vline = RGBA(0xf090a0ff),
-		.lastsel_point = RGBA(0xffffffff),
-		.handle_free = RGBA(0x000000ff),
-		.handle_auto = RGBA(0x909000ff),
-		.handle_vect = RGBA(0x409030ff),
-		.handle_align = RGBA(0x803060ff),
-		.handle_sel_free = RGBA(0x000000ff),
-		.handle_sel_auto = RGBA(0xf0ff40ff),
-		.handle_sel_vect = RGBA(0x40c030ff),
-		.handle_sel_align = RGBA(0xf090a0ff),
 		.vertex_size = 3,
 		.outline_width = 1,
 		.facedot_size = 4,
-		.movie = RGBA(0xfafafaff),
-		.image = RGBA(0xfafafaff),
-		.scene = RGBA(0xfafafaff),
-		.editmesh_active = RGBA(0xffffff80),
-		.bundle_solid = RGBA(0xc8c8c8ff),
-		.camera_path = RGBA(0x000000ff),
-		.skin_root = RGBA(0xb44d4dff),
 	},
 	.tipo = {
 		.back = RGBA(0x2f303500),
@@ -523,8 +392,7 @@ const bTheme U_theme_default = {
 		.text = RGBA(0xffffffff),
 		.text_hi = RGBA(0xffffffff),
 		.header = RGBA(0x29282eff),
-		.header_title = RGBA(0x000000ff),
-		.header_text = RGBA(0xeeeeeeff),
+		.header_text = RGBA(0xeeeeee00),
 		.header_text_hi = RGBA(0xffffffff),
 		.tab_active = RGBA(0x43444bff),
 		.tab_inactive = RGBA(0x323239ff),
@@ -547,50 +415,16 @@ const bTheme U_theme_default = {
 		},
 		.shade1 = RGBA(0x96969600),
 		.shade2 = RGBA(0x29282e64),
-		.hilite = RGBA(0x60c040ff),
 		.grid = RGBA(0x17171aff),
-		.wire = RGBA(0x000000ff),
-		.select = RGBA(0xf15800ff),
-		.lamp = RGBA(0x00000028),
-		.speaker = RGBA(0x000000ff),
-		.empty = RGBA(0x000000ff),
-		.camera = RGBA(0x000000ff),
-		.active = RGBA(0xffaa40ff),
 		.group = RGBA(0x247f0dff),
 		.group_active = RGBA(0x46a431ff),
-		.transform = RGBA(0xffffffff),
-		.vertex = RGBA(0x000000ff),
 		.vertex_select = RGBA(0xff8500ff),
-		.edge = RGBA(0x000000ff),
-		.edge_select = RGBA(0xffa000ff),
-		.edge_seam = RGBA(0xdb2512ff),
-		.edge_sharp = RGBA(0x00ffffff),
-		.edge_facesel = RGBA(0x4b4b4bff),
-		.edge_crease = RGBA(0xcc0099ff),
-		.face = RGBA(0x00000012),
-		.face_select = RGBA(0xff85003c),
-		.face_dot = RGBA(0xff8500ff),
-		.extra_edge_len = RGBA(0x200000ff),
-		.extra_face_angle = RGBA(0x000080ff),
-		.extra_face_area = RGBA(0x002000ff),
-		.normal = RGBA(0x22ddddff),
-		.vertex_normal = RGBA(0x2361ddff),
-		.bone_solid = RGBA(0xc8c8c8ff),
-		.bone_pose = RGBA(0x50c8ff50),
-		.bone_pose_active = RGBA(0x8c

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list