[Bf-blender-cvs] [4cfa21f09b3] master: Fix null-pointer dereference on error handling during VR view drawing

[Julian Eisel]

Commit: 4cfa21f09b3878141d6de5b3fc5219527fb6dfc3
Author: Julian Eisel
Date:   Tue Dec 14 20:44:17 2021 +0100
Branches: master
https://developer.blender.org/rB4cfa21f09b3878141d6de5b3fc5219527fb6dfc3

Fix null-pointer dereference on error handling during VR view drawing

===================================================================

M	source/blender/windowmanager/xr/intern/wm_xr_session.c

===================================================================

diff --git a/source/blender/windowmanager/xr/intern/wm_xr_session.c b/source/blender/windowmanager/xr/intern/wm_xr_session.c
index 24d697d9444..bad735ee598 100644
--- a/source/blender/windowmanager/xr/intern/wm_xr_session.c
+++ b/source/blender/windowmanager/xr/intern/wm_xr_session.c
@@ -1317,7 +1317,10 @@ static void wm_xr_session_surface_draw(bContext *C)
 
   GHOST_XrSessionDrawViews(wm->xr.runtime->context, &draw_data);
 
-  GPU_framebuffer_restore();
+  /* There's no active framebuffer if the session was cancelled (exception while drawing views). */
+  if (GPU_framebuffer_active_get()) {
+    GPU_framebuffer_restore();
+  }
 }
 
 static void wm_xr_session_do_depsgraph(bContext *C)