Merge branch 'blender-v2.92-release'

1 files changed, 10 insertions, 0 deletions

diff --git a/source/blender/python/gpu/gpu_py_offscreen.c b/source/blender/python/gpu/gpu_py_offscreen.c
index 00d367c603b..51038aae598 100644
--- a/source/blender/python/gpu/gpu_py_offscreen.c
+++ b/source/blender/python/gpu/gpu_py_offscreen.c
@@ -247,6 +247,12 @@ static PyObject *py_offscreen_draw_view3d(BPyGPUOffScreen *self, PyObject *args,
 
   depsgraph = BKE_scene_ensure_depsgraph(G_MAIN, scene, view_layer);
 
+  /* Disable 'bgl' state since it interfere with off-screen drawing, see: T84402. */
+  const bool is_bgl = GPU_bgl_get();
+  if (is_bgl) {
+    GPU_bgl_end();
+  }
+
   GPU_offscreen_bind(self->ofs, true);
 
   ED_view3d_draw_offscreen(depsgraph,
@@ -267,6 +273,10 @@ static PyObject *py_offscreen_draw_view3d(BPyGPUOffScreen *self, PyObject *args,
 
   GPU_offscreen_unbind(self->ofs, true);
 
+  if (is_bgl) {
+    GPU_bgl_start();
+  }
+
   Py_RETURN_NONE;
 }