[Bf-blender-cvs] [78d6c273b75] master: Merge branch 'blender-v2.90-release'

[Clément Foucault]

Commit: 78d6c273b75363e9ecc28a92ecc8b320e4baad1d
Author: Clément Foucault
Date:   Tue Aug 18 21:30:52 2020 +0200
Branches: master
https://developer.blender.org/rB78d6c273b75363e9ecc28a92ecc8b320e4baad1d

Merge branch 'blender-v2.90-release'

# Conflicts:
#	source/blender/editors/space_sequencer/sequencer_draw.c

===================================================================



===================================================================

diff --cc source/blender/editors/space_node/node_draw.c
index 696fe666f41,6ce51db2005..e36dc2f4906
--- a/source/blender/editors/space_node/node_draw.c
+++ b/source/blender/editors/space_node/node_draw.c
@@@ -1734,10 -1780,11 +1734,11 @@@ void drawnodespace(const bContext *C, A
  
    GPUFrameBuffer *framebuffer_overlay = GPU_viewport_framebuffer_overlay_get(viewport);
    GPU_framebuffer_bind_no_srgb(framebuffer_overlay);
 -  GPU_batch_presets_reset();
  
 +  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,
diff --cc source/blender/editors/space_sequencer/sequencer_draw.c
index b4556017c03,4b76f1432ee..8a6b97b3834
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@@ -1772,6 -1782,8 +1772,7 @@@ void sequencer_draw_preview(const bCont
  
    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();