[Bf-blender-cvs] [3c37f61fe47] uvimage-editor-drawing: Fix make outline color consistent
Jeroen Bakker
noreply at git.blender.org
Thu Aug 20 11:47:59 CEST 2020
Commit: 3c37f61fe47894cae4df74a8d0e9ebdb574272e3
Author: Jeroen Bakker
Date: Thu Aug 20 11:44:07 2020 +0200
Branches: uvimage-editor-drawing
https://developer.blender.org/rB3c37f61fe47894cae4df74a8d0e9ebdb574272e3
Fix make outline color consistent
===================================================================
M source/blender/draw/engines/overlay/shaders/edit_uv_edges_frag.glsl
===================================================================
diff --git a/source/blender/draw/engines/overlay/shaders/edit_uv_edges_frag.glsl b/source/blender/draw/engines/overlay/shaders/edit_uv_edges_frag.glsl
index ca0d2f66bec..b81fdd2c712 100644
--- a/source/blender/draw/engines/overlay/shaders/edit_uv_edges_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/edit_uv_edges_frag.glsl
@@ -35,8 +35,7 @@ void main()
float line_distance = distance(stipplePos_f, stippleStart_f) / max(dd.x, dd.y);
if (lineStyle == OVERLAY_UV_LINE_STYLE_OUTLINE) {
- vec4 base_color = vec4(1.0);
- inner_color = mix(base_color, colorEdgeSelect, selectionFac_f);
+ inner_color = mix(colorWireEdit, colorEdgeSelect, selectionFac_f);
outer_color = vec4(vec3(0.0), 1.0);
}
else if (lineStyle == OVERLAY_UV_LINE_STYLE_DASH) {
More information about the Bf-blender-cvs
mailing list