From 40edb84dcf4f05fe2d6a73170617af0eab0cd5ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Mon, 24 Aug 2020 11:11:00 +0200 Subject: Revert "Fix T77564: VSE (and compositor background) lost stereoscopy preview" This reverts commit d5b5b228e4d07ce8c7d32c40c87bebe6745663e2. This reverts commit 47c6f41b8926befcf1ffe8b0dcccb90922c4b9be. --- source/blender/editors/space_node/node_draw.c | 14 ++------------ source/blender/editors/space_sequencer/sequencer_draw.c | 15 +-------------- 2 files changed, 3 insertions(+), 26 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index 6ce51db2005..22b549cbd5d 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -47,13 +47,11 @@ #include "BIF_glutil.h" -#include "GPU_batch_presets.h" #include "GPU_framebuffer.h" #include "GPU_immediate.h" #include "GPU_immediate_util.h" #include "GPU_matrix.h" #include "GPU_state.h" -#include "GPU_viewport.h" #include "WM_api.h" #include "WM_types.h" @@ -1773,18 +1771,10 @@ void drawnodespace(const bContext *C, ARegion *region) SpaceNode *snode = CTX_wm_space_node(C); View2D *v2d = ®ion->v2d; - UI_view2d_view_ortho(v2d); - - /* Setup offscreen buffers. */ - GPUViewport *viewport = WM_draw_region_get_viewport(region); - - GPUFrameBuffer *framebuffer_overlay = GPU_viewport_framebuffer_overlay_get(viewport); - GPU_framebuffer_bind_no_srgb(framebuffer_overlay); - GPU_batch_presets_reset(); - UI_ThemeClearColor(TH_BACK); GPU_clear(GPU_COLOR_BIT); - GPU_depth_test(false); + + UI_view2d_view_ortho(v2d); /* XXX snode->cursor set in coordspace for placing new nodes, used for drawing noodles too */ UI_view2d_region_to_view(®ion->v2d, diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index 4b76f1432ee..995e980aba0 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -50,14 +50,12 @@ #include "IMB_colormanagement.h" #include "IMB_imbuf.h" -#include "GPU_batch_presets.h" #include "GPU_framebuffer.h" #include "GPU_immediate.h" #include "GPU_immediate_util.h" #include "GPU_matrix.h" #include "GPU_state.h" #include "GPU_vertex_buffer.h" -#include "GPU_viewport.h" #include "ED_anim_api.h" #include "ED_gpencil.h" @@ -1539,7 +1537,7 @@ static void sequencer_preview_clear(void) float col[3]; UI_GetThemeColor3fv(TH_SEQ_PREVIEW, col); - GPU_clear_color(col[0], col[1], col[2], 1.0); + GPU_clear_color(col[0], col[1], col[2], 0.0); GPU_clear(GPU_COLOR_BIT); } @@ -1777,14 +1775,6 @@ void sequencer_draw_preview(const bContext *C, return; } - /* Setup offscreen buffers. */ - GPUViewport *viewport = WM_draw_region_get_viewport(region); - - GPUFrameBuffer *framebuffer_overlay = GPU_viewport_framebuffer_overlay_get(viewport); - GPU_framebuffer_bind_no_srgb(framebuffer_overlay); - GPU_batch_presets_reset(); - GPU_depth_test(false); - if (sseq->render_size == SEQ_PROXY_RENDER_SIZE_NONE) { sequencer_preview_clear(); return; @@ -1808,9 +1798,6 @@ void sequencer_draw_preview(const bContext *C, ibuf = sequencer_ibuf_get( bmain, depsgraph, scene, sseq, cfra, frame_ofs, names[sseq->multiview_eye]); - /* sequencer_ibuf_get can call GPU_framebuffer_bind. So disable srgb framebuffer again. */ - GPU_framebuffer_bind_no_srgb(framebuffer_overlay); - if (ibuf) { scope = sequencer_get_scope(scene, sseq, ibuf, draw_backdrop); -- cgit v1.2.3