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_extra.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_extra.c')
-rw-r--r--source/blender/draw/engines/overlay/overlay_extra.c33
1 files changed, 7 insertions, 26 deletions
diff --git a/source/blender/draw/engines/overlay/overlay_extra.c b/source/blender/draw/engines/overlay/overlay_extra.c
index 53a743eb124..20c3464b6d9 100644
--- a/source/blender/draw/engines/overlay/overlay_extra.c
+++ b/source/blender/draw/engines/overlay/overlay_extra.c
@@ -1600,30 +1600,19 @@ void OVERLAY_extra_cache_populate(OVERLAY_Data *vedata, Object *ob)
}
}
-void OVERLAY_extra_draw(OVERLAY_Data *vedata)
+void OVERLAY_extra_blend_draw(OVERLAY_Data *vedata)
{
- OVERLAY_FramebufferList *fbl = vedata->fbl;
- OVERLAY_PrivateData *pd = vedata->stl->pd;
- OVERLAY_PassList *psl = vedata->psl;
-
- DRW_draw_pass(psl->extra_blend_ps);
-
- if (pd->antialiasing.enabled) {
- GPU_framebuffer_bind(fbl->overlay_line_fb);
- }
-
- DRW_draw_pass(psl->extra_ps[0]);
+ DRW_draw_pass(vedata->psl->extra_blend_ps);
+}
- if (pd->antialiasing.enabled) {
- GPU_framebuffer_bind(fbl->overlay_default_fb);
- }
+void OVERLAY_extra_draw(OVERLAY_Data *vedata)
+{
+ DRW_draw_pass(vedata->psl->extra_ps[0]);
}
void OVERLAY_extra_in_front_draw(OVERLAY_Data *vedata)
{
- OVERLAY_PassList *psl = vedata->psl;
-
- DRW_draw_pass(psl->extra_ps[1]);
+ DRW_draw_pass(vedata->psl->extra_ps[1]);
OVERLAY_volume_free_smoke_textures(vedata);
}
@@ -1633,14 +1622,6 @@ void OVERLAY_extra_centers_draw(OVERLAY_Data *vedata)
OVERLAY_FramebufferList *fbl = vedata->fbl;
OVERLAY_PassList *psl = vedata->psl;
- if (DRW_state_is_fbo()) {
- GPU_framebuffer_bind(fbl->overlay_color_only_fb);
- }
-
DRW_draw_pass(psl->extra_grid_ps);
DRW_draw_pass(psl->extra_centers_ps);
-
- if (DRW_state_is_fbo()) {
- GPU_framebuffer_bind(fbl->overlay_default_fb);
- }
}