Merge branch 'blender-v2.92-release'
This commit is contained in:
@@ -247,6 +247,12 @@ static PyObject *py_offscreen_draw_view3d(BPyGPUOffScreen *self, PyObject *args,
|
|||||||
|
|
||||||
depsgraph = BKE_scene_ensure_depsgraph(G_MAIN, scene, view_layer);
|
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);
|
GPU_offscreen_bind(self->ofs, true);
|
||||||
|
|
||||||
ED_view3d_draw_offscreen(depsgraph,
|
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);
|
GPU_offscreen_unbind(self->ofs, true);
|
||||||
|
|
||||||
|
if (is_bgl) {
|
||||||
|
GPU_bgl_start();
|
||||||
|
}
|
||||||
|
|
||||||
Py_RETURN_NONE;
|
Py_RETURN_NONE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user