diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2020-08-18 17:04:41 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2020-08-18 17:04:41 +0300 |
commit | 872efd8d73a3820680379230d83a0aadf5fc29ca (patch) | |
tree | f7afa0e32c99cdecec136f7fe317b8f78c4f5939 /source | |
parent | b3b67a61b7761508dd3369d12df90bb333200359 (diff) | |
parent | 47c6f41b8926befcf1ffe8b0dcccb90922c4b9be (diff) |
Merge branch 'blender-v2.90-release'
# Conflicts:
# source/blender/editors/space_node/node_draw.c
# source/blender/editors/space_sequencer/sequencer_draw.c
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/space_node/node_draw.c | 3 | ||||
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_draw.c | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index df1a24eb71a..0a754b6ec2a 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -1762,11 +1762,10 @@ void drawnodespace(const bContext *C, ARegion *region) GPUFrameBuffer *framebuffer_overlay = GPU_viewport_framebuffer_overlay_get(viewport); GPU_framebuffer_bind_no_srgb(framebuffer_overlay); + UI_view2d_view_ortho(v2d); UI_ThemeClearColor(TH_BACK); GPU_clear(GPU_COLOR_BIT); - 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, win->eventstate->x - region->winrct.xmin, diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index b784104e9ce..908ead31724 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -1776,17 +1776,17 @@ void sequencer_draw_preview(const bContext *C, return; } - if (sseq->render_size == SEQ_PROXY_RENDER_SIZE_NONE) { - sequencer_preview_clear(); - 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); + if (sseq->render_size == SEQ_PROXY_RENDER_SIZE_NONE) { + sequencer_preview_clear(); + return; + } + /* Setup view. */ sequencer_display_size(scene, viewrect); UI_view2d_totRect_set(v2d, viewrect[0] + 0.5f, viewrect[1] + 0.5f); |