[Bf-blender-cvs] [161b72fc481] temp-vse-grid-lines: Use darker lines, Change grid line spacing
Richard Antalik
noreply at git.blender.org
Tue Jul 27 18:30:43 CEST 2021
Commit: 161b72fc48190e79b15b8decddda56adb92e8f0c
Author: Richard Antalik
Date: Tue Jul 27 18:28:59 2021 +0200
Branches: temp-vse-grid-lines
https://developer.blender.org/rB161b72fc48190e79b15b8decddda56adb92e8f0c
Use darker lines, Change grid line spacing
===================================================================
M release/datafiles/userdef/userdef_default_theme.c
M source/blender/blenloader/intern/versioning_userdef.c
M source/blender/editors/space_sequencer/sequencer_draw.c
===================================================================
diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c
index cd79ee05f67..85532d01d5c 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -638,7 +638,7 @@ const bTheme U_theme_default = {
.sub_back = RGBA(0x0000003e),
},
.shade1 = RGBA(0xa0a0a000),
- .grid = RGBA(0x363636ff),
+ .grid = RGBA(0x212121ff),
.vertex_select = RGBA(0xff8500ff),
.bone_pose = RGBA(0x50c8ff50),
.cframe = RGBA(0x5680c2ff),
diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c
index 743d12d9456..ae8fc0e72c3 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -297,7 +297,7 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
*/
{
/* Keep this block, even when empty. */
- copy_v4_uchar(btheme->space_sequencer.grid, 54);
+ copy_v4_uchar(btheme->space_sequencer.grid, 33);
btheme->space_sequencer.grid[3] = 255;
}
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index a2f79f7087d..6993e37f61a 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -2417,8 +2417,10 @@ void draw_timeline_seq(const bContext *C, ARegion *region)
SEQ_timeline_boundbox(scene, SEQ_active_seqbase_get(ed), &v2d->tot);
draw_seq_backdrop(v2d);
if ((sseq->flag & SEQ_SHOW_STRIP_OVERLAY) && (sseq->flag & SEQ_SHOW_GRID)) {
+ U.v2d_min_gridsize *= 3;
UI_view2d_draw_lines_x__discrete_frames_or_seconds(
v2d, scene, (sseq->flag & SEQ_DRAWFRAMES) == 0, false);
+ U.v2d_min_gridsize /= 3;
}
/* Only draw backdrop in timeline view. */
More information about the Bf-blender-cvs
mailing list