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

2 files changed, 84 insertions, 79 deletions

diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c
index 30b80863585..04a34cfd1ae 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -253,13 +253,13 @@ const bTheme U_theme_default = {
 		.header = RGBA(0x424242ff),
 		.header_text = RGBA(0xeeeeeeff),
 		.header_text_hi = RGBA(0xffffffff),
-		.tab_active = RGBA(0x4b4b4bff),
-		.tab_inactive = RGBA(0x323232ff),
+		.tab_active = RGBA(0x5680c2ff),
+		.tab_inactive = RGBA(0x424242ff),
 		.tab_back = RGBA(0x232323ff),
 		.tab_outline = RGBA(0x2d2d2dff),
-		.button = RGBA(0x35353599),
+		.button = RGBA(0x424242ff),
 		.button_title = RGBA(0xffffffff),
-		.button_text = RGBA(0xffffffff),
+		.button_text = RGBA(0xe5e5e5ff),
 		.button_text_hi = RGBA(0xffffffff),
 		.panelcolors = {
 			.header = RGBA(0x42424200),
@@ -279,13 +279,13 @@ const bTheme U_theme_default = {
 		.header = RGBA(0x42424200),
 		.header_text = RGBA(0xeeeeeeff),
 		.header_text_hi = RGBA(0xffffffff),
-		.tab_active = RGBA(0x4b4b4bff),
-		.tab_inactive = RGBA(0x323232ff),
+		.tab_active = RGBA(0x5680c2ff),
+		.tab_inactive = RGBA(0x424242ff),
 		.tab_back = RGBA(0x232323ff),
 		.tab_outline = RGBA(0x2d2d2dff),
 		.button = RGBA(0x35353500),
 		.button_title = RGBA(0xffffffff),
-		.button_text = RGBA(0xffffffff),
+		.button_text = RGBA(0xe5e5e5ff),
 		.button_text_hi = RGBA(0xffffffff),
 		.panelcolors = {
 			.header = RGBA(0x424242cc),
@@ -372,13 +372,13 @@ const bTheme U_theme_default = {
 		.header = RGBA(0x2e2e2eff),
 		.header_text = RGBA(0xeeeeeeff),
 		.header_text_hi = RGBA(0xffffffff),
-		.tab_active = RGBA(0x4b4b4bff),
-		.tab_inactive = RGBA(0x323232ff),
+		.tab_active = RGBA(0x5680c2ff),
+		.tab_inactive = RGBA(0x424242ff),
 		.tab_back = RGBA(0x232323ff),
 		.tab_outline = RGBA(0x2d2d2dff),
-		.button = RGBA(0x35353599),
+		.button = RGBA(0x424242ff),
 		.button_title = RGBA(0xffffffff),
-		.button_text = RGBA(0xffffffff),
+		.button_text = RGBA(0xe5e5e5ff),
 		.button_text_hi = RGBA(0xffffffff),
 		.panelcolors = {
 			.header = RGBA(0x424242cc),
@@ -400,13 +400,13 @@ const bTheme U_theme_default = {
 		.header = RGBA(0x2e2e2eff),
 		.header_text = RGBA(0xeeeeeeff),
 		.header_text_hi = RGBA(0xffffffff),
-		.tab_active = RGBA(0x4b4b4bff),
-		.tab_inactive = RGBA(0x323232ff),
+		.tab_active = RGBA(0x5680c2ff),
+		.tab_inactive = RGBA(0x424242ff),
 		.tab_back = RGBA(0x232323ff),
 		.tab_outline = RGBA(0x2d2d2dff),
-		.button = RGBA(0x35353599),
+		.button = RGBA(0x424242ff),
 		.button_title = RGBA(0xffffffff),
-		.button_text = RGBA(0xffffffff),
+		.button_text = RGBA(0xe5e5e5ff),
 		.button_text_hi = RGBA(0xffffffff),
 		.list = RGBA(0x2e2e2eff),
 		.list_title = RGBA(0xffffffff),
@@ -451,13 +451,13 @@ const bTheme U_theme_default = {
 		.header = RGBA(0x424242ff),
 		.header_text = RGBA(0xeeeeeeff),
 		.header_text_hi = RGBA(0xffffffff),
-		.tab_active = RGBA(0x4b4b4bff),
-		.tab_inactive = RGBA(0x323232ff),
+		.tab_active = RGBA(0x5680c2ff),
+		.tab_inactive = RGBA(0x424242ff),
 		.tab_back = RGBA(0x232323ff),
 		.tab_outline = RGBA(0x2d2d2dff),
-		.button = RGBA(0x35353599),
+		.button = RGBA(0x424242ff),
 		.button_title = RGBA(0xffffffff),
-		.button_text = RGBA(0xffffffff),
+		.button_text = RGBA(0xe5e5e5ff),
 		.button_text_hi = RGBA(0xffffffff),
 		.panelcolors = {
 			.header = RGBA(0x424242cc),
@@ -487,13 +487,13 @@ const bTheme U_theme_default = {
 		.header = RGBA(0x424242ff),
 		.header_text = RGBA(0xeeeeeeff),
 		.header_text_hi = RGBA(0xffffffff),
-		.tab_active = RGBA(0x4b4b4bff),
-		.tab_inactive = RGBA(0x323232ff),
+		.tab_active = RGBA(0x5680c2ff),
+		.tab_inactive = RGBA(0x424242ff),
 		.tab_back = RGBA(0x232323ff),
 		.tab_outline = RGBA(0x2d2d2dff),
-		.button = RGBA(0x35353599),
+		.button = RGBA(0x424242ff),
 		.button_title = RGBA(0xffffffff),
-		.button_text = RGBA(0xffffffff),
+		.button_text = RGBA(0xe5e5e5ff),
 		.button_text_hi = RGBA(0xffffffff),
 		.list = RGBA(0x2e2e2eff),
 		.list_title = RGBA(0xd8d8d8ff),
@@ -542,13 +542,13 @@ const bTheme U_theme_default = {
 		.header = RGBA(0x212121ff),
 		.header_text = RGBA(0xeeeeeeff),
 		.header_text_hi = RGBA(0xffffffff),
-		.tab_active = RGBA(0x4b4b4bff),
-		.tab_inactive = RGBA(0x323232ff),
+		.tab_active = RGBA(0x5680c2ff),
+		.tab_inactive = RGBA(0x424242ff),
 		.tab_back = RGBA(0x232323ff),
 		.tab_outline = RGBA(0x2d2d2dff),
-		.button = RGBA(0x35353599),
+		.button = RGBA(0x424242ff),
 		.button_title = RGBA(0xffffffff),
-		.button_text = RGBA(0xffffffff),
+		.button_text = RGBA(0xe5e5e5ff),
 		.button_text_hi = RGBA(0xffffffff),
 		.list = RGBA(0x2e2e2eff),
 		.list_title = RGBA(0xffffffff),
@@ -591,13 +591,13 @@ const bTheme U_theme_default = {
 		.header = RGBA(0x424242ff),
 		.header_text = RGBA(0xeeeeeeff),
 		.header_text_hi = RGBA(0xffffffff),
-		.tab_active = RGBA(0x4b4b4bff),
-		.tab_inactive = RGBA(0x323232ff),
+		.tab_active = RGBA(0x5680c2ff),
+		.tab_inactive = RGBA(0x424242ff),
 		.tab_back = RGBA(0x232323ff),
 		.tab_outline = RGBA(0x2d2d2dff),
-		.button = RGBA(0x35353599),
+		.button = RGBA(0x424242ff),
 		.button_title = RGBA(0xffffffff),
-		.button_text = RGBA(0xffffffff),
+		.button_text = RGBA(0xe5e5e5ff),
 		.button_text_hi = RGBA(0xffffffff),
 		.panelcolors = {
 			.header = RGBA(0x424242cc),
@@ -635,13 +635,13 @@ const bTheme U_theme_default = {
 		.header = RGBA(0x424242ff),
 		.header_text = RGBA(0xeeeeeeff),
 		.header_text_hi = RGBA(0xffffffff),
-		.tab_active = RGBA(0x4b4b4bff),
-		.tab_inactive = RGBA(0x323232ff),
+		.tab_active = RGBA(0x5680c2ff),
+		.tab_inactive = RGBA(0x424242ff),
 		.tab_back = RGBA(0x232323ff),
 		.tab_outline = RGBA(0x2d2d2dff),
-		.button = RGBA(0x35353599),
+		.button = RGBA(0x424242ff),
 		.button_title = RGBA(0xffffffff),
-		.button_text = RGBA(0xffffffff),
+		.button_text = RGBA(0xe5e5e5ff),
 		.button_text_hi = RGBA(0xffffffff),
 		.panelcolors = {
 			.header = RGBA(0x424242cc),
@@ -691,13 +691,13 @@ const bTheme U_theme_default = {
 		.header = RGBA(0x42424200),
 		.header_text = RGBA(0xeeeeeeff),
 		.header_text_hi = RGBA(0xffffffff),
-		.tab_active = RGBA(0x4b4b4bff),
-		.tab_inactive = RGBA(0x323232ff),
+		.tab_active = RGBA(0x5680c2ff),
+		.tab_inactive = RGBA(0x424242ff),
 		.tab_back = RGBA(0x232323ff),
 		.tab_outline = RGBA(0x2d2d2dff),
-		.button = RGBA(0x35353599),
+		.button = RGBA(0x424242ff),
 		.button_title = RGBA(0xffffffff),
-		.button_text = RGBA(0xffffffff),
+		.button_text = RGBA(0xe5e5e5ff),
 		.button_text_hi = RGBA(0xffffffff),
 		.panelcolors = {
 			.header = RGBA(0x42424200),
@@ -729,13 +729,13 @@ const bTheme U_theme_default = {
 		.header = RGBA(0x454545ff),
 		.header_text = RGBA(0xeeeeeeff),
 		.header_text_hi = RGBA(0xffffffff),
-		.tab_active = RGBA(0x4b4b4bff),
-		.tab_inactive = RGBA(0x323232ff),
+		.tab_active = RGBA(0x5680c2ff),
+		.tab_inactive = RGBA(0x424242ff),
 		.tab_back = RGBA(0x232323ff),
 		.tab_outline = RGBA(0x2d2d2dff),
-		.button = RGBA(0x35353599),
+		.button = RGBA(0x424242ff),
 		.button_title = RGBA(0xffffffff),
-		.button_text = RGBA(0xffffffff),
+		.button_text = RGBA(0xe5e5e5ff),
 		.button_text_hi = RGBA(0xffffffff),
 		.panelcolors = {
 			.header = RGBA(0x424242cc),
@@ -756,20 +756,20 @@ const bTheme U_theme_default = {
 		.facedot_size = 4,
 	},
 	.tnode = {
-		.back = RGBA(0x32323200),
+		.back = RGBA(0x23232300),
 		.title = RGBA(0xeeeeeeff),
 		.text = RGBA(0xffffffff),
 		.text_hi = RGBA(0xffffffff),
 		.header = RGBA(0x424242ff),
 		.header_text = RGBA(0xeeeeeeff),
 		.header_text_hi = RGBA(0xffffffff),
-		.tab_active = RGBA(0x4b4b4bff),
-		.tab_inactive = RGBA(0x323232ff),
+		.tab_active = RGBA(0x5680c2ff),
+		.tab_inactive = RGBA(0x424242ff),
 		.tab_back = RGBA(0x232323ff),
 		.tab_outline = RGBA(0x2d2d2dff),
-		.button = RGBA(0x35353599),
+		.button = RGBA(0x424242ff),
 		.button_title = RGBA(0xffffffff),
-		.button_text = RGBA(0xffffffff),
+		.button_text = RGBA(0xe5e5e5ff),
 		.button_text_hi = RGBA(0xffffffff),
 		.list = RGBA(0x2e2e2eff),
 		.list_title = RGBA(0xffffffff),
@@ -784,31 +784,32 @@ const bTheme U_theme_default = {
 		},
 		.shade2 = RGBA(0x7f707064),
 		.wire = RGBA(0x808080ff),
-		.select = RGBA(0x099be6ff),
+		.select = RGBA(0xed5700ff),
 		.active = RGBA(0xffffffff),
 		.edge_select = RGBA(0xffffffff),
-		.console_output = RGBA(0xdfc300ff),
+		.console_output = RGBA(0x1a1a1aff),
 		.vertex_size = 3,
 		.outline_width = 1,
 		.facedot_size = 4,
-		.syntaxl = RGBA(0x666666ff),
-		.syntaxs = RGBA(0x977474ff),
-		.syntaxb = RGBA(0xffcb4dff),
-		.syntaxn = RGBA(0xff6675ff),
+		.syntaxl = RGBA(0x565656ff),
+		.syntaxs = RGBA(0x975b5bff),
+		.syntaxb = RGBA(0xccb83dff),
+		.syntaxn = RGBA(0xe64555ff),
 		.syntaxv = RGBA(0x66c4ffff),
-		.syntaxc = RGBA(0x59b36aff),
+		.syntaxc = RGBA(0x49b300ff),
 		.syntaxd = RGBA(0x749797ff),
 		.syntaxr = RGBA(0x808080ff),
-		.nodeclass_output = RGBA(0xff6675ff),
-		.nodeclass_filter = RGBA(0x6c696fff),
-		.nodeclass_vector = RGBA(0x9999ffff),
-		.nodeclass_texture = RGBA(0xffc399ff),
-		.nodeclass_shader = RGBA(0xa7ff99ff),
-		.nodeclass_script = RGBA(0x6c696fff),
+		.nodeclass_output = RGBA(0xb33641ff),
+		.nodeclass_filter = RGBA(0x584d80ff),
+		.nodeclass_vector = RGBA(0x9b80ffff),
+		.nodeclass_texture = RGBA(0xe68745ff),
+		.nodeclass_shader = RGBA(0x39bf6dff),
+		.nodeclass_script = RGBA(0x084d4dff),
 		.nodeclass_pattern = RGBA(0x6c696fff),
 		.nodeclass_layout = RGBA(0x6c696fff),
 		.movie = RGBA(0x9b9b9ba0),
 		.gp_vertex_size = 3,
+		.gp_vertex = RGBA(0x97979700),
 		.gp_vertex_select = RGBA(0xff8500ff),
 	},
 	.tuserpref = {
@@ -819,13 +820,13 @@ const bTheme U_theme_default = {
 		.header = RGBA(0x424242ff),
 		.header_text = RGBA(0xeeeeeeff),
 		.header_text_hi = RGBA(0xffffffff),
-		.tab_active = RGBA(0x4b4b4bff),
-		.tab_inactive = RGBA(0x323232ff),
+		.tab_active = RGBA(0x5680c2ff),
+		.tab_inactive = RGBA(0x424242ff),
 		.tab_back = RGBA(0x232323ff),
 		.tab_outline = RGBA(0x2d2d2dff),
-		.button = RGBA(0x35353599),
+		.button = RGBA(0x424242ff),
 		.button_title = RGBA(0xffffffff),
-		.button_text = RGBA(0xffffffff),
+		.button_text = RGBA(0xe5e5e5ff),
 		.button_text_hi = RGBA(0xffffffff),
 		.panelcolors = {
 			.header = RGBA(0x42424200),
@@ -846,13 +847,13 @@ const bTheme U_theme_default = {
 		.header = RGBA(0x424242ff),
 		.header_text = RGBA(0xeeeeeeff),
 		.header_text_hi = RGBA(0xffffffff),
-		.tab_active = RGBA(0x4b4b4bff),
-		.tab_inactive = RGBA(0x323232ff),
+		.tab_active = RGBA(0x5680c2ff),
+		.tab_inactive = RGBA(0x424242ff),
 		.tab_back = RGBA(0x232323ff),
 		.tab_outline = RGBA(0x2d2d2dff),
-		.button = RGBA(0x35353599),
+		.button = RGBA(0x424242ff),
 		.button_title = RGBA(0xffffffff),
-		.button_text = RGBA(0xffffffff),
+		.button_text = RGBA(0xe5e5e5ff),
 		.button_text_hi = RGBA(0xffffffff),
 		.panelcolors = {
 			.header = RGBA(0x424242cc),
@@ -879,13 +880,13 @@ const bTheme U_theme_default = {
 		.header = RGBA(0x424242ff),
 		.header_text = RGBA(0xeeeeeeff),
 		.header_text_hi = RGBA(0xffffffff),
-		.tab_active = RGBA(0x4b4b4bff),
-		.tab_inactive = RGBA(0x323232ff),
+		.tab_active = RGBA(0x5680c2ff),
+		.tab_inactive = RGBA(0x424242ff),
 		.tab_back = RGBA(0x232323ff),
 		.tab_outline = RGBA(0x2d2d2dff),
-		.button = RGBA(0x35353599),
+		.button = RGBA(0x424242ff),
 		.button_title = RGBA(0xffffffff),
-		.button_text = RGBA(0xffffffff),
+		.button_text = RGBA(0xe5e5e5ff),
 		.button_text_hi = RGBA(0xffffffff),
 		.list = RGBA(0x666666ff),
 		.list_text_hi = RGBA(0xffffffff),
@@ -925,13 +926,13 @@ const bTheme U_theme_default = {
 		.header = RGBA(0x232323ff),
 		.header_text = RGBA(0xeeeeeeff),
 		.header_text_hi = RGBA(0xffffffff),
-		.tab_active = RGBA(0x4b4b4bff),
-		.tab_inactive = RGBA(0x323232ff),
+		.tab_active = RGBA(0x5680c2ff),
+		.tab_inactive = RGBA(0x424242ff),
 		.tab_back = RGBA(0x232323ff),
 		.tab_outline = RGBA(0x2d2d2dff),
-		.button = RGBA(0x35353599),
+		.button = RGBA(0x424242ff),
 		.button_title = RGBA(0xffffffff),
-		.button_text = RGBA(0xffffffff),
+		.button_text = RGBA(0xe5e5e5ff),
 		.button_text_hi = RGBA(0xffffffff),
 		.panelcolors = {
 			.header = RGBA(0x424242cc),
@@ -953,8 +954,8 @@ const bTheme U_theme_default = {
 		.header = RGBA(0x303030ff),
 		.header_text = RGBA(0xaaaaaaff),
 		.header_text_hi = RGBA(0xffffffff),
-		.tab_active = RGBA(0x4b4b4bff),
-		.tab_inactive = RGBA(0x323232ff),
+		.tab_active = RGBA(0x5680c2ff),
+		.tab_inactive = RGBA(0x424242ff),
 		.tab_back = RGBA(0x232323ff),
 		.tab_outline = RGBA(0x2d2d2dff),
 		.button = RGBA(0x353535ff),
diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index beb59d2c512..5cf28578217 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -465,6 +465,10 @@ class INFO_MT_window(Menu):
         layout = self.layout
 
         layout.operator("wm.window_new")
+        layout.operator("wm.window_new_main")
+
+        layout.separator()
+
         layout.operator("wm.window_fullscreen_toggle", icon='FULLSCREEN_ENTER')
 
         layout.separator()