From ee98482b44fc9ce9123447ec5b08e8f9f5d44854 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 6 Mar 2024 17:46:08 +0100 Subject: [PATCH] Fix #119058: Crash with OpenGL render and 3D viewport lock rotation --- source/blender/editors/render/render_opengl.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/source/blender/editors/render/render_opengl.cc b/source/blender/editors/render/render_opengl.cc index 5b439f65d91..443a3530b90 100644 --- a/source/blender/editors/render/render_opengl.cc +++ b/source/blender/editors/render/render_opengl.cc @@ -792,8 +792,12 @@ static bool screen_opengl_render_init(bContext *C, wmOperator *op) oglrender->prevar = prevar; if (is_view_context) { - /* so quad view renders camera */ - ED_view3d_context_user_region(C, &oglrender->v3d, &oglrender->region); + /* Prefer rendering camera in quad view if possible. */ + if (!ED_view3d_context_user_region(C, &oglrender->v3d, &oglrender->region)) { + /* If not get region activated by ED_view3d_context_activate earlier. */ + oglrender->v3d = CTX_wm_view3d(C); + oglrender->region = CTX_wm_region(C); + } oglrender->rv3d = static_cast(oglrender->region->regiondata);