[Bf-blender-cvs] [aa82e489467] uvimage-editor-drawing: Draw selected UV's on top

[Jeroen Bakker]

Commit: aa82e4894672b20c658d57a795c41274a4886ab2
Author: Jeroen Bakker
Date:   Thu Sep 10 08:29:02 2020 +0200
Branches: uvimage-editor-drawing
https://developer.blender.org/rBaa82e4894672b20c658d57a795c41274a4886ab2

Draw selected UV's on top

===================================================================

M	source/blender/draw/engines/overlay/overlay_edit_uv.c
M	source/blender/draw/engines/overlay/overlay_engine.c
M	source/blender/draw/engines/overlay/shaders/edit_uv_edges_vert.glsl

===================================================================

diff --git a/source/blender/draw/engines/overlay/overlay_edit_uv.c b/source/blender/draw/engines/overlay/overlay_edit_uv.c
index b77f70fe77a..4981b8483a7 100644
--- a/source/blender/draw/engines/overlay/overlay_edit_uv.c
+++ b/source/blender/draw/engines/overlay/overlay_edit_uv.c
@@ -132,7 +132,8 @@ void OVERLAY_edit_uv_cache_init(OVERLAY_Data *vedata)
     /* uv edges */
     {
       DRW_PASS_CREATE(psl->edit_uv_edges_ps,
-                      DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_ALWAYS | DRW_STATE_BLEND_ALPHA);
+                      DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS_EQUAL |
+                          DRW_STATE_BLEND_ALPHA);
       GPUShader *sh = OVERLAY_shader_edit_uv_edges_get();
       if (pd->edit_uv.do_uv_shadow_overlay) {
         pd->edit_uv_shadow_edges_grp = DRW_shgroup_create(sh, psl->edit_uv_edges_ps);
diff --git a/source/blender/draw/engines/overlay/overlay_engine.c b/source/blender/draw/engines/overlay/overlay_engine.c
index db2ae96ac8d..9cdd371ec4e 100644
--- a/source/blender/draw/engines/overlay/overlay_engine.c
+++ b/source/blender/draw/engines/overlay/overlay_engine.c
@@ -485,6 +485,9 @@ static void OVERLAY_draw_scene(void *vedata)
   if (pd->is_image_editor) {
     OVERLAY_background_draw(data);
     OVERLAY_grid_draw(data);
+    if (DRW_state_is_fbo()) {
+      GPU_framebuffer_bind(dfbl->overlay_fb);
+    }
     OVERLAY_edit_uv_draw(data);
     return;
   }
diff --git a/source/blender/draw/engines/overlay/shaders/edit_uv_edges_vert.glsl b/source/blender/draw/engines/overlay/shaders/edit_uv_edges_vert.glsl
index e5ec8ef395e..5e9d8054bc0 100644
--- a/source/blender/draw/engines/overlay/shaders/edit_uv_edges_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/edit_uv_edges_vert.glsl
@@ -27,6 +27,9 @@ void main()
     selectionFac = 0.0;
   }
 
+  float depth = 1.0 - selectionFac;
+  gl_Position.z = depth;
+
   /* Avoid precision loss. */
   stippleStart = stipplePos = 500.0 + 500.0 * (gl_Position.xy / gl_Position.w);
 }