Merge remote-tracking branch 'origin/blender2.8' into temp-eeveelightcachetemp-eeveelightcache

# Conflicts:
#	source/blender/draw/engines/eevee/eevee_lightprobes.c

1 files changed, 31 insertions, 31 deletions

diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c
index f7a4bd157e0..2b84585b8a5 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -46,7 +46,7 @@ const bTheme U_theme_default = {
 			.item = RGBA(0xffffff8f),
 			.text = RGBA(0xffffffff),
 			.text_sel = RGBA(0xffffffff),
-			.roundness = 0.25f,
+			.roundness = 0.2f,
 		},
 		.wcol_text = {
 			.outline = RGBA(0x444444ff),
@@ -57,12 +57,12 @@ const bTheme U_theme_default = {
 			.text_sel = RGBA(0xffffffff),
 			.shaded = 1,
 			.shadetop = -3,
-			.roundness = 0.1f,
+			.roundness = 0.2f,
 		},
 		.wcol_radio = {
 			.outline = RGBA(0x373737ff),
 			.inner = RGBA(0x595959ff),
-			.inner_sel = RGBA(0x5680c2e6),
+			.inner_sel = RGBA(0x597cb3e6),
 			.item = RGBA(0xffffffff),
 			.text = RGBA(0xeeeeeeff),
 			.text_sel = RGBA(0xffffffff),
@@ -78,7 +78,7 @@ const bTheme U_theme_default = {
 			.text = RGBA(0xeeeeeeff),
 			.text_sel = RGBA(0xffffffff),
 			.shadedown = -15,
-			.roundness = 0.25f,
+			.roundness = 0.2f,
 		},
 		.wcol_toggle = {
 			.outline = RGBA(0x373737ff),
@@ -87,7 +87,7 @@ const bTheme U_theme_default = {
 			.item = RGBA(0x191919ff),
 			.text = RGBA(0xeeeeeeff),
 			.text_sel = RGBA(0xffffffff),
-			.roundness = 0.25f,
+			.roundness = 0.4f,
 		},
 		.wcol_num = {
 			.outline = RGBA(0x444444ff),
@@ -96,7 +96,7 @@ const bTheme U_theme_default = {
 			.item = RGBA(0x333333ff),
 			.text = RGBA(0xeeeeeeff),
 			.text_sel = RGBA(0xffffffff),
-			.roundness = 0.3f,
+			.roundness = 0.2f,
 		},
 		.wcol_numslider = {
 			.outline = RGBA(0x444444ff),
@@ -107,7 +107,7 @@ const bTheme U_theme_default = {
 			.text_sel = RGBA(0xffffffff),
 			.shaded = 1,
 			.shadetop = -4,
-			.roundness = 0.4f,
+			.roundness = 0.2f,
 		},
 		.wcol_tab = {
 			.outline = RGBA(0x2d2d2dff),
@@ -116,7 +116,7 @@ const bTheme U_theme_default = {
 			.item = RGBA(0x2d2d2dff),
 			.text = RGBA(0xa4a4a4ff),
 			.text_sel = RGBA(0xffffffff),
-			.roundness = 0.15f,
+			.roundness = 0.2f,
 		},
 		.wcol_menu = {
 			.outline = RGBA(0x444444ff),
@@ -149,15 +149,15 @@ const bTheme U_theme_default = {
 			.text_sel = RGBA(0xffffffff),
 			.shadetop = 25,
 			.shadedown = -20,
-			.roundness = 0.25f,
+			.roundness = 0.2f,
 		},
 		.wcol_menu_item = {
-			.inner_sel = RGBA(0x5680c2ff),
+			.inner_sel = RGBA(0x597cb3e6),
 			.item = RGBA(0xffffff8f),
 			.text = RGBA(0xeeeeeeff),
 			.text_sel = RGBA(0xffffffff),
 			.shadetop = 38,
-			.roundness = 0.25f,
+			.roundness = 0.2f,
 		},
 		.wcol_tooltip = {
 			.outline = RGBA(0x19191aff),
@@ -168,7 +168,7 @@ const bTheme U_theme_default = {
 			.text_sel = RGBA(0xffffffff),
 			.shadetop = 25,
 			.shadedown = -20,
-			.roundness = 0.4f,
+			.roundness = 0.2f,
 		},
 		.wcol_box = {
 			.outline = RGBA(0x444444ff),
@@ -197,7 +197,7 @@ const bTheme U_theme_default = {
 			.item = RGBA(0x5680c2ff),
 			.text = RGBA(0xeeeeeeff),
 			.text_sel = RGBA(0xffffffff),
-			.roundness = 0.25f,
+			.roundness = 0.2f,
 		},
 		.wcol_list_item = {
 			.outline = RGBA(0x2d2d2dff),
@@ -209,22 +209,22 @@ const bTheme U_theme_default = {
 			.roundness = 0.2f,
 		},
 		.wcol_pie_menu = {
-			.outline = RGBA(0x2e2e2eff),
-			.inner = RGBA(0x212121ff),
+			.outline = RGBA(0x212121ff),
+			.inner = RGBA(0x212121ef),
 			.inner_sel = RGBA(0x585858ff),
-			.item = RGBA(0x5680c2ff),
+			.item = RGBA(0x597cb3ff),
 			.text = RGBA(0xeeeeeeff),
 			.text_sel = RGBA(0xffffffff),
 			.shadetop = 10,
 			.shadedown = -10,
-			.roundness = 0.5f,
+			.roundness = 0.2f,
 		},
 		.wcol_state = {
-			.inner_anim = RGBA(0x73be4cff),
+			.inner_anim = RGBA(0x53992eff),
 			.inner_anim_sel = RGBA(0x5aa633ff),
-			.inner_key = RGBA(0xf0eb64ff),
+			.inner_key = RGBA(0xb3ae36ff),
 			.inner_key_sel = RGBA(0xd7d34bff),
-			.inner_driven = RGBA(0xb400ffff),
+			.inner_driven = RGBA(0x9000ccff),
 			.inner_driven_sel = RGBA(0x9900e6ff),
 			.inner_overridden = RGBA(0x19c3c300),
 			.inner_overridden_sel = RGBA(0x118f8f00),
@@ -288,8 +288,8 @@ const bTheme U_theme_default = {
 		.button_text = RGBA(0xe5e5e5ff),
 		.button_text_hi = RGBA(0xffffffff),
 		.panelcolors = {
-			.header = RGBA(0x424242cc),
-			.back = RGBA(0x333333b3),
+			.header = RGBA(0x424242e6),
+			.back = RGBA(0x333333f0),
 			.sub_back = RGBA(0x0000003e),
 			.show_header = 1,
 			.show_back = 1,
@@ -387,13 +387,13 @@ const bTheme U_theme_default = {
 			.show_header = 1,
 			.show_back = 1,
 		},
-		.hilite = RGBA(0x5b8199ff),
+		.hilite = RGBA(0x4f76b3ff),
 		.vertex_size = 3,
 		.outline_width = 1,
 		.facedot_size = 4,
 	},
 	.tipo = {
-		.back = RGBA(0x35353500),
+		.back = RGBA(0x42424200),
 		.title = RGBA(0xffffffff),
 		.text = RGBA(0xffffffff),
 		.text_hi = RGBA(0xffffffff),
@@ -421,12 +421,12 @@ const bTheme U_theme_default = {
 		},
 		.shade1 = RGBA(0x96969600),
 		.shade2 = RGBA(0x2e2e2e64),
-		.grid = RGBA(0x1a1a1aff),
+		.grid = RGBA(0x2a2a2aff),
 		.group = RGBA(0x44992eff),
 		.group_active = RGBA(0x5ccd3eff),
 		.vertex = RGBA(0x000000ff),
 		.vertex_select = RGBA(0xff8500ff),
-		.cframe = RGBA(0x308837ff),
+		.cframe = RGBA(0x5680c2ff),
 		.lastsel_point = RGBA(0xffffffff),
 		.handle_auto = RGBA(0x909000ff),
 		.handle_vect = RGBA(0x409030ff),
@@ -510,12 +510,12 @@ const bTheme U_theme_default = {
 		.shade1 = RGBA(0xc0c0c000),
 		.shade2 = RGBA(0x70707064),
 		.hilite = RGBA(0x60c040ff),
-		.grid = RGBA(0x272727ff),
+		.grid = RGBA(0x2a2a2aff),
 		.group = RGBA(0x44992eff),
 		.group_active = RGBA(0x5ccd3eff),
 		.strip = RGBA(0x1a151580),
 		.strip_select = RGBA(0xff8c00ff),
-		.cframe = RGBA(0x308837ff),
+		.cframe = RGBA(0x5680c2ff),
 		.ds_channel = RGBA(0x5a85b2ff),
 		.ds_subchannel = RGBA(0x7d98b3ff),
 		.keytype_keyframe = RGBA(0xe8e8e8ff),
@@ -566,7 +566,7 @@ const bTheme U_theme_default = {
 		.grid = RGBA(0x5e5e5eff),
 		.strip = RGBA(0x0c0a0a80),
 		.strip_select = RGBA(0xff8c00ff),
-		.cframe = RGBA(0x308837ff),
+		.cframe = RGBA(0x5680c2ff),
 		.keyborder = RGBA(0x000000ff),
 		.keyborder_select = RGBA(0x000000ff),
 		.vertex_size = 3,
@@ -611,7 +611,7 @@ const bTheme U_theme_default = {
 		.grid = RGBA(0x404040ff),
 		.vertex_select = RGBA(0xff8500ff),
 		.bone_pose = RGBA(0x50c8ff50),
-		.cframe = RGBA(0x308837ff),
+		.cframe = RGBA(0x5680c2ff),
 		.vertex_size = 3,
 		.outline_width = 1,
 		.facedot_size = 4,
@@ -900,7 +900,7 @@ const bTheme U_theme_default = {
 		},
 		.strip = RGBA(0x0c0a0a80),
 		.strip_select = RGBA(0xff8c00ff),
-		.cframe = RGBA(0x308837ff),
+		.cframe = RGBA(0x5680c2ff),
 		.handle_auto = RGBA(0x909000ff),
 		.handle_align = RGBA(0x803060ff),
 		.handle_sel_auto = RGBA(0xf0ff40ff),