diff options
author | Pablo Vazquez <pablo@blender.org> | 2021-11-05 17:08:09 +0300 |
---|---|---|
committer | Pablo Vazquez <pablo@blender.org> | 2021-11-05 17:08:09 +0300 |
commit | 885c79915f58c39741abb47bc4e1ad0f45e5c6c2 (patch) | |
tree | 3611b3c427e0705b1c4739e84b1a632dbf244fa0 /source | |
parent | a0f50c18900ed366a825457c553d2d6e383c1483 (diff) | |
parent | e65230f0c03c60f4e7b6561dcec8928992861a59 (diff) |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenloader/intern/versioning_userdef.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_draw.c | 19 |
2 files changed, 7 insertions, 16 deletions
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); |