bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.2-release'

Browse Source
This commit is contained in:
Aras Pranckevicius 2024-07-05 12:35:59 +03:00
commit eafcd66c0a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/gpu/shaders/gpu_shader_sequencer_strips_frag.glsl
View File

@ -191,9 +191,14 @@ void main()
col = add_outline(d, 3.0, 4.0, col, vec4(0, 0, 0, 0.33));
}
/* Active, but not selected strips get a thin inner line. */
bool active = (strip.flags & GPU_SEQ_FLAG_ACTIVE) != 0;
if (active && !selected) {
col = add_outline(sdf, 1.0, 2.0, col, col_outline);
}
/* Outer 1px outline for all strips. */
col = add_outline(
sdf, 0.0, 1.0, col, selected ? unpackUnorm4x8(context_data.col_back) : col_outline);
col = add_outline(sdf, 0.0, 1.0, col, unpackUnorm4x8(context_data.col_back));
}
fragColor = col;