Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--release/datafiles/userdef/userdef_default_theme.c52
-rw-r--r--source/blender/blenloader/intern/versioning_userdef.c4
-rw-r--r--source/blender/editors/space_sequencer/sequencer_draw.c19
3 files changed, 33 insertions, 42 deletions
diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c
index fc489abace8..ed98bb5fdf4 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -25,7 +25,7 @@ const bTheme U_theme_default = {
.outline = RGBA(0x3d3d3dff),
.inner = RGBA(0x545454ff),
.inner_sel = RGBA(0x4772b3ff),
- .item = RGBA(0xffffff80),
+ .item = RGBA(0x1d1d1d80),
.text = RGBA(0xd9d9d9ff),
.text_sel = RGBA(0xffffffff),
.roundness = 0.2f,
@@ -43,7 +43,7 @@ const bTheme U_theme_default = {
.outline = RGBA(0x3d3d3dff),
.inner = RGBA(0x282828ff),
.inner_sel = RGBA(0x4772b3ff),
- .item = RGBA(0xffffff80),
+ .item = RGBA(0xffffffb3),
.text = RGBA(0xe6e6e6ff),
.text_sel = RGBA(0xffffffff),
.roundness = 0.2f,
@@ -59,7 +59,7 @@ const bTheme U_theme_default = {
},
.wcol_radio = {
.outline = RGBA(0x3d3d3dff),
- .inner = RGBA(0x282828ff),
+ .inner = RGBA(0x545454ff),
.inner_sel = RGBA(0x4772b3ff),
.item = RGBA(0x252525ff),
.text = RGBA(0xe6e6e6ff),
@@ -68,8 +68,8 @@ const bTheme U_theme_default = {
},
.wcol_option = {
.outline = RGBA(0x3d3d3dff),
- .inner = RGBA(0x282828ff),
- .inner_sel = RGBA(0x71aaffff),
+ .inner = RGBA(0x545454ff),
+ .inner_sel = RGBA(0x6699e6ff),
.item = RGBA(0x111111ff),
.text = RGBA(0xe6e6e6ff),
.text_sel = RGBA(0xffffffff),
@@ -77,7 +77,7 @@ const bTheme U_theme_default = {
},
.wcol_toggle = {
.outline = RGBA(0x3d3d3dff),
- .inner = RGBA(0x282828ff),
+ .inner = RGBA(0x545454ff),
.inner_sel = RGBA(0x4772b3ff),
.item = RGBA(0x252525ff),
.text = RGBA(0xe6e6e6ff),
@@ -148,11 +148,11 @@ const bTheme U_theme_default = {
.roundness = 0.2f,
},
.wcol_tooltip = {
- .outline = RGBA(0x19191aff),
- .inner = RGBA(0x181818ff),
- .inner_sel = RGBA(0x181818ff),
- .item = RGBA(0x181818ff),
- .text = RGBA(0xccccccff),
+ .outline = RGBA(0x242424ff),
+ .inner = RGBA(0x1d1d1dff),
+ .inner_sel = RGBA(0x4772b3ff),
+ .item = RGBA(0xd9d9d9ff),
+ .text = RGBA(0xd9d9d9ff),
.text_sel = RGBA(0xffffffff),
.roundness = 0.2f,
},
@@ -193,10 +193,10 @@ const bTheme U_theme_default = {
.roundness = 0.2f,
},
.wcol_pie_menu = {
- .outline = RGBA(0x3d3d3dff),
+ .outline = RGBA(0x242424ff),
.inner = RGBA(0x181818ff),
- .inner_sel = RGBA(0x5680c2ff),
- .item = RGBA(0x4772b3ff),
+ .inner_sel = RGBA(0x4772b3ff),
+ .item = RGBA(0xd9d9d9ff),
.text = RGBA(0xd9d9d9ff),
.text_sel = RGBA(0xffffffff),
.roundness = 0.2f,
@@ -414,7 +414,7 @@ const bTheme U_theme_default = {
.list = RGBA(0x1d1d1dff),
.list_title = RGBA(0xffffffff),
.list_text = RGBA(0xb8b8b8ff),
- .list_text_hi = RGBA(0xffffffff),
+ .list_text_hi = RGBA(0xffaf23ff),
.navigation_bar = RGBA(0x1d1d1dff),
.execution_buts = RGBA(0x303030ff),
.panelcolors = {
@@ -497,7 +497,7 @@ const bTheme U_theme_default = {
.back = RGBA(0x30303000),
.title = RGBA(0xeeeeeeff),
.text = RGBA(0xa6a6a6ff),
- .text_hi = RGBA(0x143e66ff),
+ .text_hi = RGBA(0xffffffff),
.header = RGBA(0x303030b3),
.header_text = RGBA(0xeeeeeeff),
.header_text_hi = RGBA(0xffffffff),
@@ -512,7 +512,7 @@ const bTheme U_theme_default = {
.list = RGBA(0x1d1d1dff),
.list_title = RGBA(0xffffffff),
.list_text = RGBA(0xb8b8b8ff),
- .list_text_hi = RGBA(0xffffffff),
+ .list_text_hi = RGBA(0xffaf23ff),
.navigation_bar = RGBA(0x1d1d1dff),
.execution_buts = RGBA(0x303030ff),
.panelcolors = {
@@ -573,8 +573,8 @@ const bTheme U_theme_default = {
.button_text_hi = RGBA(0xffffffff),
.list = RGBA(0x1d1d1dff),
.list_title = RGBA(0xffffffff),
- .list_text = RGBA(0xe5e5e5ff),
- .list_text_hi = RGBA(0xffffffff),
+ .list_text = RGBA(0xb8b8b8ff),
+ .list_text_hi = RGBA(0xffaf23ff),
.navigation_bar = RGBA(0x1d1d1dff),
.execution_buts = RGBA(0x303030ff),
.panelcolors = {
@@ -612,7 +612,7 @@ const bTheme U_theme_default = {
.nla_sound_sel = RGBA(0x1f7a7aff),
},
.space_sequencer = {
- .back = RGBA(0x30303000),
+ .back = RGBA(0x18181800),
.title = RGBA(0xeeeeeeff),
.text = RGBA(0xa6a6a6ff),
.text_hi = RGBA(0xffffffff),
@@ -635,7 +635,7 @@ const bTheme U_theme_default = {
.sub_back = RGBA(0x0000001f),
},
.shade1 = RGBA(0xa0a0a000),
- .grid = RGBA(0x181818ff),
+ .grid = RGBA(0x303030ff),
.vertex_select = RGBA(0xff8500ff),
.bone_pose = RGBA(0x50c8ff50),
.cframe = RGBA(0x4772b3ff),
@@ -811,8 +811,8 @@ const bTheme U_theme_default = {
.button_text_hi = RGBA(0xffffffff),
.list = RGBA(0x303030ff),
.list_title = RGBA(0xffffffff),
- .list_text = RGBA(0xccccccff),
- .list_text_hi = RGBA(0xffffffff),
+ .list_text = RGBA(0xb8b8b8ff),
+ .list_text_hi = RGBA(0xffaf23ff),
.navigation_bar = RGBA(0x1d1d1dff),
.execution_buts = RGBA(0x303030ff),
.panelcolors = {
@@ -935,7 +935,7 @@ const bTheme U_theme_default = {
.list = RGBA(0x303030ff),
.list_title = RGBA(0xffffff00),
.list_text = RGBA(0xb8b8b8ff),
- .list_text_hi = RGBA(0xffffffff),
+ .list_text_hi = RGBA(0xffaf23ff),
.navigation_bar = RGBA(0x1d1d1dff),
.execution_buts = RGBA(0x303030ff),
.panelcolors = {
@@ -1046,8 +1046,8 @@ const bTheme U_theme_default = {
.button_text_hi = RGBA(0xffffffff),
.list = RGBA(0x303030ff),
.list_title = RGBA(0xc3c3c3ff),
- .list_text = RGBA(0xc3c3c3ff),
- .list_text_hi = RGBA(0xffffffff),
+ .list_text = RGBA(0xb8b8b8ff),
+ .list_text_hi = RGBA(0xffaf23ff),
.navigation_bar = RGBA(0x1d1d1dff),
.execution_buts = RGBA(0x303030ff),
.panelcolors = {
diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c
index c31e046b20d..473a7e413ce 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -325,6 +325,10 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
memcpy(btheme, &U_theme_default, sizeof(*btheme));
}
+ if (!USER_VERSION_ATLEAST(300, 41)) {
+ memcpy(btheme, &U_theme_default, sizeof(*btheme));
+ }
+
/**
* Versioning code until next subversion bump goes here.
*
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 379788ecf49..3374ff11726 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -2274,11 +2274,11 @@ static void draw_seq_backdrop(View2D *v2d)
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
/* View backdrop. */
- immUniformThemeColorShade(TH_BACK, -25);
+ immUniformThemeColor(TH_BACK);
immRectf(pos, v2d->cur.xmin, v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
/* Darker overlay over the view backdrop. */
- immUniformThemeColorShade(TH_BACK, -20);
+ immUniformThemeColorShade(TH_BACK, -10);
immRectf(pos, v2d->cur.xmin, -1.0, v2d->cur.xmax, 1.0);
/* Alternating horizontal stripes. */
@@ -2295,19 +2295,6 @@ static void draw_seq_backdrop(View2D *v2d)
}
GPU_blend(GPU_BLEND_NONE);
-
- /* Lines separating the horizontal bands. */
- i = max_ii(1, ((int)v2d->cur.ymin) - 1);
- int line_len = (int)v2d->cur.ymax - i + 1;
- immUniformThemeColorShade(TH_GRID, 10);
- immBegin(GPU_PRIM_LINES, line_len * 2);
- while (line_len--) {
- immVertex2f(pos, v2d->cur.xmax, i);
- immVertex2f(pos, v2d->cur.xmin, i);
- i++;
- }
- immEnd();
-
immUnbindProgram();
}
@@ -2413,7 +2400,7 @@ static void seq_draw_sfra_efra(const Scene *scene, View2D *v2d)
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
/* Draw overlay outside of frame range. */
- immUniformThemeColorShadeAlpha(TH_BACK, -25, -100);
+ immUniformThemeColorShadeAlpha(TH_BACK, -10, -100);
if (frame_sta < frame_end) {
immRectf(pos, v2d->cur.xmin, v2d->cur.ymin, (float)frame_sta, v2d->cur.ymax);
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 08:54:25 +0300