From c4534909b26fa9e7e4441a503facc4b88ca42bd7 Mon Sep 17 00:00:00 2001 From: Aras Pranckevicius Date: Fri, 5 Jul 2024 11:35:18 +0200 Subject: [PATCH] Fix #123578: VSE active but unselected strip outline visual tweak Instead of making the dark outline be bright for active but unselected strips, make it have dark outline just like all other strips, and a 1px inner bright line inside of that. Pull Request: https://projects.blender.org/blender/blender/pulls/124210 --- .../gpu/shaders/gpu_shader_sequencer_strips_frag.glsl | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/source/blender/gpu/shaders/gpu_shader_sequencer_strips_frag.glsl b/source/blender/gpu/shaders/gpu_shader_sequencer_strips_frag.glsl index 5440d3f5a37..b94b3adde23 100644 --- a/source/blender/gpu/shaders/gpu_shader_sequencer_strips_frag.glsl +++ b/source/blender/gpu/shaders/gpu_shader_sequencer_strips_frag.glsl @@ -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;