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_wireframe.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_wireframe.c')
-rw-r--r--source/blender/draw/engines/overlay/overlay_wireframe.c16
1 files changed, 4 insertions, 12 deletions
diff --git a/source/blender/draw/engines/overlay/overlay_wireframe.c b/source/blender/draw/engines/overlay/overlay_wireframe.c
index 781e1c10afa..b52434fa6c6 100644
--- a/source/blender/draw/engines/overlay/overlay_wireframe.c
+++ b/source/blender/draw/engines/overlay/overlay_wireframe.c
@@ -41,7 +41,8 @@ void OVERLAY_wireframe_init(OVERLAY_Data *vedata)
{
OVERLAY_PrivateData *pd = vedata->stl->pd;
const DRWContextState *draw_ctx = DRW_context_state_get();
- pd->view_wires = DRW_view_create_with_zoffset(pd->view_default, draw_ctx->rv3d, 0.5f);
+ DRWView *default_view = (DRWView *)DRW_view_default_get();
+ pd->view_wires = DRW_view_create_with_zoffset(default_view, draw_ctx->rv3d, 0.5f);
}
void OVERLAY_wireframe_cache_init(OVERLAY_Data *vedata)
@@ -221,22 +222,13 @@ void OVERLAY_wireframe_cache_populate(OVERLAY_Data *vedata,
void OVERLAY_wireframe_draw(OVERLAY_Data *data)
{
- OVERLAY_FramebufferList *fbl = data->fbl;
OVERLAY_PassList *psl = data->psl;
OVERLAY_PrivateData *pd = data->stl->pd;
- if (pd->antialiasing.enabled) {
- GPU_framebuffer_bind(fbl->overlay_line_fb);
- }
-
DRW_view_set_active(pd->view_wires);
DRW_draw_pass(psl->wireframe_ps);
- DRW_view_set_active(pd->view_default);
-
- if (pd->antialiasing.enabled) {
- GPU_framebuffer_bind(fbl->overlay_default_fb);
- }
+ DRW_view_set_active(NULL);
}
void OVERLAY_wireframe_in_front_draw(OVERLAY_Data *data)
@@ -247,5 +239,5 @@ void OVERLAY_wireframe_in_front_draw(OVERLAY_Data *data)
DRW_view_set_active(pd->view_wires);
DRW_draw_pass(psl->wireframe_xray_ps);
- DRW_view_set_active(pd->view_default);
+ DRW_view_set_active(NULL);
}