Fix crash when clicking in window while Blender starts
authorSybren A. Stüvel <sybren@blender.org>
Wed, 10 Jul 2019 10:32:10 +0000 (12:32 +0200)
committerSybren A. Stüvel <sybren@blender.org>
Wed, 10 Jul 2019 10:32:10 +0000 (12:32 +0200)
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

index 2e34ff7f9c185f548ace191ab79864bf0a88ee7a..eef36dae86a2c866f1e52b858bab321ae7dc7d23 100644 (file)
@@ -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();