Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2019-12-05 02:32:21 +0300
committerClément Foucault <foucault.clem@gmail.com>2019-12-05 02:43:37 +0300
commit1b33e1f9ae77ab5faeee96a89f7c040b026e647b (patch)
tree547ca56ec5beda31bc4b7574a99fa282b723eef8 /source/blender/draw/engines/overlay/overlay_paint.c
parent4949a62d4d73d3185576a33a893701c0bf02dcfb (diff)
Overlay Engine: Cleanup & enable line AA on in front passes
- Remove pd->view_default, was a leftover from TAA implementation - Sanitize active_view switches. - Sanitize framebuffers switches.
Diffstat (limited to 'source/blender/draw/engines/overlay/overlay_paint.c')
-rw-r--r--source/blender/draw/engines/overlay/overlay_paint.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/draw/engines/overlay/overlay_paint.c b/source/blender/draw/engines/overlay/overlay_paint.c
index 4e73770472d..d1eb3291ffd 100644
--- a/source/blender/draw/engines/overlay/overlay_paint.c
+++ b/source/blender/draw/engines/overlay/overlay_paint.c
@@ -202,9 +202,15 @@ void OVERLAY_paint_weight_cache_populate(OVERLAY_Data *vedata, Object *ob)
void OVERLAY_paint_draw(OVERLAY_Data *vedata)
{
OVERLAY_PassList *psl = vedata->psl;
+ OVERLAY_FramebufferList *fbl = vedata->fbl;
+ DefaultFramebufferList *dfbl = DRW_viewport_framebuffer_list_get();
+
+ if (DRW_state_is_fbo()) {
+ /* Pain overlay needs final color because of multiply blend mode. */
+ GPU_framebuffer_bind(dfbl->default_fb);
+ }
if (psl->paint_color_ps) {
- DRW_view_set_active(NULL);
DRW_draw_pass(psl->paint_color_ps);
}
DRW_draw_pass(psl->paint_overlay_ps);