Merge branch 'blender-v2.90-release'

# Conflicts:
#	source/blender/editors/space_sequencer/sequencer_draw.c
This commit is contained in:
Clément Foucault 2020-08-18 21:30:52 +02:00
commit 78d6c273b7
2 changed files with 2 additions and 0 deletions

View File

@ -1738,6 +1738,7 @@ void drawnodespace(const bContext *C, ARegion *region)
UI_view2d_view_ortho(v2d);
UI_ThemeClearColor(TH_BACK);
GPU_clear(GPU_COLOR_BIT);
GPU_depth_test(false);
/* XXX snode->cursor set in coordspace for placing new nodes, used for drawing noodles too */
UI_view2d_region_to_view(&region->v2d,

View File

@ -1772,6 +1772,7 @@ void sequencer_draw_preview(const bContext *C,
GPUFrameBuffer *framebuffer_overlay = GPU_viewport_framebuffer_overlay_get(viewport);
GPU_framebuffer_bind_no_srgb(framebuffer_overlay);
GPU_depth_test(false);
if (sseq->render_size == SEQ_PROXY_RENDER_SIZE_NONE) {
sequencer_preview_clear();