DRW: DebugDraw: Fix unguarded drw_debug_draw()

This might create nullptr dereference in some cases.

2 files changed, 4 insertions, 1 deletions

diff --git a/source/blender/draw/intern/draw_debug.cc b/source/blender/draw/intern/draw_debug.cc
index 4bfdda06609..c610d7a2ffc 100644
--- a/source/blender/draw/intern/draw_debug.cc
+++ b/source/blender/draw/intern/draw_debug.cc
@@ -595,11 +595,13 @@ blender::draw::DebugDraw *DRW_debug_get()
 
 void drw_debug_draw()
 {
-  if (!GPU_shader_storage_buffer_objects_support()) {
+#ifdef DEBUG
+  if (!GPU_shader_storage_buffer_objects_support() || DST.debug == nullptr) {
     return;
   }
   /* TODO(fclem): Convenience for now. Will have to move to DRWManager. */
   reinterpret_cast<blender::draw::DebugDraw *>(DST.debug)->display_to_view();
+#endif
 }
 
 /**
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 4688ca6604e..63c7cc667cb 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -3029,6 +3029,7 @@ void DRW_engines_free(void)
   DRW_globals_free();
 
   drw_debug_module_free(DST.debug);
+  DST.debug = NULL;
 
   DRW_UBO_FREE_SAFE(G_draw.block_ubo);
   DRW_UBO_FREE_SAFE(G_draw.view_ubo);