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>2020-08-18 22:30:52 +0300
committerClément Foucault <foucault.clem@gmail.com>2020-08-18 22:30:52 +0300
commit78d6c273b75363e9ecc28a92ecc8b320e4baad1d (patch)
treef6679a0e2f1cb2a6f7ed15f4bea6bd84a68d38c3 /source/blender/editors
parent33fde699e2854fc3b40b8b39be3c67284e39cf7a (diff)
parentd5b5b228e4d07ce8c7d32c40c87bebe6745663e2 (diff)
Merge branch 'blender-v2.90-release'
# Conflicts: # source/blender/editors/space_sequencer/sequencer_draw.c
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/space_node/node_draw.c1
-rw-r--r--source/blender/editors/space_sequencer/sequencer_draw.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c
index 696fe666f41..e36dc2f4906 100644
--- a/source/blender/editors/space_node/node_draw.c
+++ b/source/blender/editors/space_node/node_draw.c
@@ -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,
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index b4556017c03..8a6b97b3834 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -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();