From 12ceea04344ac8267d391b57187ffd0aa336c3cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Wed, 10 Jul 2019 12:32:10 +0200 Subject: Fix crash when clicking in window while Blender starts A mouse click in the window will trigger the `VIEW3D_OT_cursor3d` operator before the viewport is available. This causes a segfault in `GPU_viewport_engines_data_validate()`. Other callers of `WM_draw_region_get_viewport()` already check for `NULL` being returned and handle it gracefully. Reviewed By: jbakker, fclem Differential Revision: https://developer.blender.org/D5216 --- source/blender/editors/space_view3d/view3d_draw.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source') diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 2e34ff7f9c1..eef36dae86a 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -804,7 +804,11 @@ void ED_view3d_draw_depth(Depsgraph *depsgraph, ARegion *ar, View3D *v3d, bool a GPU_depth_test(true); GPUViewport *viewport = WM_draw_region_get_viewport(ar, 0); - DRW_draw_depth_loop(depsgraph, ar, v3d, viewport); + /* When Blender is starting, a click event can trigger a depth test while the viewport is not + * yet available. */ + if (viewport != NULL) { + DRW_draw_depth_loop(depsgraph, ar, v3d, viewport); + } if (rv3d->rflag & RV3D_CLIPPING) { ED_view3d_clipping_disable(); -- cgit v1.2.3