Merge branch 'master' into wm-drag-drop-rewrite

1 files changed, 40 insertions, 17 deletions

diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c
index ce22dceb397..b35d060d884 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -238,9 +238,12 @@ const bTheme U_theme_default = {
     .menu_shadow_fac = 0.3f,
     .menu_shadow_width = 4,
     .editor_outline = RGBA(0x1f1f1fff),
-    .widget_text_cursor = RGBA(0x3399e6ff),
     .icon_alpha = 1.0f,
     .icon_saturation = 0.5f,
+    .transparent_checker_primary = RGBA(0x333333ff),
+    .transparent_checker_secondary = RGBA(0x262626ff),
+    .transparent_checker_size = 8,
+    .widget_text_cursor = RGBA(0x3399e6ff),
     .xaxis = RGBA(0xff3352ff),
     .yaxis = RGBA(0x8bdc00ff),
     .zaxis = RGBA(0x2890ffff),
@@ -249,6 +252,7 @@ const bTheme U_theme_default = {
     .gizmo_secondary = RGBA(0x63ffffff),
     .gizmo_a = RGBA(0x4da84dff),
     .gizmo_b = RGBA(0xa33535ff),
+    .gizmo_view_align = RGBA(0xffffffff),
     .icon_scene = RGBA(0xe6e6e6ff),
     .icon_collection = RGBA(0xf4f4f4ff),
     .icon_object = RGBA(0xee9e5dff),
@@ -324,11 +328,11 @@ const bTheme U_theme_default = {
     .edge_facesel = RGBA(0x4b4b4bff),
     .edge_crease = RGBA(0xcc0099ff),
     .edge_bevel = RGBA(0x00a5ffff),
-    .face = RGBA(0xffffff12),
-    .face_select = RGBA(0xffa5526c),
-    .face_dot = RGBA(0xff8a00ff),
+    .face = RGBA(0xffffff02),
+    .face_select = RGBA(0xffa5522e),
     .face_back = RGBA(0xff0000b3),
     .face_front = RGBA(0x0000ffb3),
+    .face_dot = RGBA(0xff8a00ff),
     .extra_edge_len = RGBA(0x150806ff),
     .extra_edge_angle = RGBA(0x4d4d00ff),
     .extra_face_angle = RGBA(0x0000ccff),
@@ -363,7 +367,7 @@ const bTheme U_theme_default = {
     .outline_width = 1,
     .obcenter_dia = 6,
     .facedot_size = 3,
-    .editmesh_active = RGBA(0xffffff80),
+    .editmesh_active = RGBA(0xffffff33),
     .clipping_border_3d = RGBA(0x313131ff),
     .bundle_solid = RGBA(0xc8c8c8ff),
     .camera_path = RGBA(0x000000ff),
@@ -413,7 +417,7 @@ const bTheme U_theme_default = {
     .tab_inactive = RGBA(0x2b2b2bff),
     .tab_back = RGBA(0x232323ff),
     .tab_outline = RGBA(0x232323ff),
-    .button = RGBA(0x282828ff),
+    .button = RGBA(0x424242ff),
     .button_title = RGBA(0xffffffff),
     .button_text = RGBA(0xe5e5e5ff),
     .button_text_hi = RGBA(0xffffffff),
@@ -435,6 +439,8 @@ const bTheme U_theme_default = {
     .vertex_select = RGBA(0xff8500ff),
     .cframe = RGBA(0x5680c2ff),
     .time_scrub_background = RGBA(0x292929e6),
+    .time_marker_line = RGBA(0x00000060),
+    .time_marker_line_selected = RGBA(0xffffff60),
     .lastsel_point = RGBA(0xffffffff),
     .handle_auto = RGBA(0x909000ff),
     .handle_vect = RGBA(0x409030ff),
@@ -479,13 +485,17 @@ const bTheme U_theme_default = {
     .facedot_size = 4,
     .info_selected = RGBA(0x3b5689ff),
     .info_selected_text = RGBA(0xffffffff),
-    .info_error = RGBA(0x990000ff),
+    .info_error = RGBA(0xff613dff),
     .info_error_text = RGBA(0xffffffff),
-    .info_warning = RGBA(0xb36a00ff),
+    .info_warning = RGBA(0xf5bc41ff),
     .info_warning_text = RGBA(0xffffffff),
     .info_info = RGBA(0x1d4383ff),
     .info_info_text = RGBA(0xffffffff),
     .info_debug = RGBA(0xd3d3d3ff),
+    .info_property = RGBA(0x3ace87ff),
+    .info_property_text = RGBA(0xffffffff),
+    .info_operator = RGBA(0x3ace87ff),
+    .info_operator_text = RGBA(0xffffffff),
   },
   .space_action = {
     .back = RGBA(0x42424200),
@@ -522,6 +532,8 @@ const bTheme U_theme_default = {
     .strip_select = RGBA(0xff8c00cc),
     .cframe = RGBA(0x5680c2ff),
     .time_scrub_background = RGBA(0x292929e6),
+    .time_marker_line = RGBA(0x00000060),
+    .time_marker_line_selected = RGBA(0xffffff60),
     .ds_channel = RGBA(0x0f2c4d24),
     .ds_subchannel = RGBA(0x143e6624),
     .ds_ipoline = RGBA(0x94e575cc),
@@ -576,6 +588,8 @@ const bTheme U_theme_default = {
     .strip_select = RGBA(0xff8c00ff),
     .cframe = RGBA(0x5680c2ff),
     .time_scrub_background = RGBA(0x292929e6),
+    .time_marker_line = RGBA(0x00000060),
+    .time_marker_line_selected = RGBA(0xffffff60),
     .ds_channel = RGBA(0x5a85b2ff),
     .ds_subchannel = RGBA(0x7d98b3ff),
     .keyborder = RGBA(0x000000ff),
@@ -624,18 +638,24 @@ const bTheme U_theme_default = {
     .bone_pose = RGBA(0x50c8ff50),
     .cframe = RGBA(0x5680c2ff),
     .time_scrub_background = RGBA(0x292929e6),
+    .time_marker_line = RGBA(0x00000060),
+    .time_marker_line_selected = RGBA(0xffffff60),
     .vertex_size = 3,
     .outline_width = 1,
     .facedot_size = 4,
-    .movie = RGBA(0x516987ff),
-    .movieclip = RGBA(0x20208fff),
-    .image = RGBA(0x6d5881ff),
-    .scene = RGBA(0x4e983eff),
-    .audio = RGBA(0x2e8f8fff),
-    .effect = RGBA(0xa9547cff),
-    .transition = RGBA(0xa25f6fff),
-    .meta = RGBA(0x6d9183ff),
-    .text_strip = RGBA(0xa29700ff),
+    .movie = RGBA(0x4d6890ff),
+    .movieclip = RGBA(0x8f4c4cff),
+    .mask = RGBA(0x666666ff),
+    .image = RGBA(0x8f744bff),
+    .scene = RGBA(0x828f50ff),
+    .audio = RGBA(0x4c8f8fff),
+    .effect = RGBA(0x514a73ff),
+    .transition = RGBA(0x8f4571ff),
+    .meta = RGBA(0x5b4d91ff),
+    .text_strip = RGBA(0x824c8fff),
+    .color_strip = RGBA(0x8f8f8fff),
+    .active_strip = RGBA(0xd9d9d9ff),
+    .selected_strip = RGBA(0xff8f0dff),
     .gp_vertex_size = 3,
     .gp_vertex_select = RGBA(0xff8500ff),
     .anim_preview_range = RGBA(0xa14d0066),
@@ -798,6 +818,7 @@ const bTheme U_theme_default = {
     .vertex_size = 3,
     .outline_width = 1,
     .facedot_size = 4,
+    .grid_levels = 2,
     .syntaxl = RGBA(0x565656ff),
     .syntaxs = RGBA(0x975b5bff),
     .syntaxb = RGBA(0xccb83dff),
@@ -905,6 +926,8 @@ const bTheme U_theme_default = {
     .strip_select = RGBA(0xff8c00ff),
     .cframe = RGBA(0x5680c2ff),
     .time_scrub_background = RGBA(0x292929e6),
+    .time_marker_line = RGBA(0x00000060),
+    .time_marker_line_selected = RGBA(0xffffff60),
     .handle_auto = RGBA(0x909000ff),
     .handle_align = RGBA(0x803060ff),
     .handle_sel_auto = RGBA(0xf0ff40ff),