diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2020-09-01 13:01:02 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2020-09-01 13:03:52 +0300 |
| commit | d6d2897ef04a7c1b3d5fb357629e534055629857 (patch) | |
| tree | e46f14b06b2210d703102c7692b53c73fa6b6b23 | |
| parent | 991eb5f79c5381eb45df90e526f5332b4364b35c (diff) | |
Sequencer: Fix crash caused by stereo rendering fix
Caused by rB2e908156d0c7
This was caused by the sequencer timeline area not using a GPUViewport
but still using `sequencer_draw_preview`.
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_draw.c | 5 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_draw.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index a3235c78dc9..cdc7ada8c84 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -2271,6 +2271,11 @@ void draw_timeline_seq(const bContext *C, ARegion *region) seq_prefetch_wm_notify(C, scene); + 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_depth_test(GPU_DEPTH_NONE); + UI_GetThemeColor3fv(TH_BACK, col); if (ed && ed->metastack.first) { GPU_clear_color(col[0], col[1], col[2] - 0.1f, 0.0f); diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c index e32db12b596..c0de86a599c 100644 --- a/source/blender/windowmanager/intern/wm_draw.c +++ b/source/blender/windowmanager/intern/wm_draw.c @@ -310,7 +310,7 @@ static bool wm_region_use_viewport_by_type(short space_type, short region_type) { return (ELEM(space_type, SPACE_VIEW3D, SPACE_IMAGE, SPACE_NODE) && region_type == RGN_TYPE_WINDOW) || - ((space_type == SPACE_SEQ) && region_type == RGN_TYPE_PREVIEW); + ((space_type == SPACE_SEQ) && ELEM(region_type, RGN_TYPE_PREVIEW, RGN_TYPE_WINDOW)); } bool WM_region_use_viewport(ScrArea *area, ARegion *region) |