[Bf-blender-cvs] [a25bb245e99] draw-colormanagement: Overlay: Fix background covering the outline

[Clément Foucault]

Commit: a25bb245e9940354815b7c2288adc93eb049019b
Author: Clément Foucault
Date:   Fri Jan 24 16:21:56 2020 +0100
Branches: draw-colormanagement
https://developer.blender.org/rBa25bb245e9940354815b7c2288adc93eb049019b

Overlay: Fix background covering the outline

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

M	source/blender/draw/engines/overlay/overlay_background.c
M	source/blender/draw/engines/overlay/overlay_engine.c

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

diff --git a/source/blender/draw/engines/overlay/overlay_background.c b/source/blender/draw/engines/overlay/overlay_background.c
index f55ed6505d3..5128f43e78e 100644
--- a/source/blender/draw/engines/overlay/overlay_background.c
+++ b/source/blender/draw/engines/overlay/overlay_background.c
@@ -44,6 +44,9 @@ void OVERLAY_background_draw(OVERLAY_Data *vedata)
   OVERLAY_PassList *psl = vedata->psl;
 
   if (DRW_state_is_fbo()) {
+    /* TODO(fclem) Drawing the background inside the overlay buffer will become a problem
+     * once we cache the overlay result.
+     * Because the render can change / refine the alpha chanel. */
     DRW_draw_pass(psl->background_ps);
   }
 }
diff --git a/source/blender/draw/engines/overlay/overlay_engine.c b/source/blender/draw/engines/overlay/overlay_engine.c
index b89de7fc96c..4df51db6083 100644
--- a/source/blender/draw/engines/overlay/overlay_engine.c
+++ b/source/blender/draw/engines/overlay/overlay_engine.c
@@ -395,13 +395,13 @@ static void OVERLAY_draw_scene(void *vedata)
 
   DRW_view_set_active(NULL);
 
+  OVERLAY_background_draw(vedata);
   OVERLAY_outline_draw(vedata);
 
   if (DRW_state_is_fbo()) {
     GPU_framebuffer_bind(fbl->overlay_default_fb);
   }
 
-  OVERLAY_background_draw(vedata);
   OVERLAY_image_draw(vedata);
   OVERLAY_facing_draw(vedata);
   OVERLAY_extra_blend_draw(vedata);