diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2020-08-05 16:59:04 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2020-08-05 16:59:04 +0300 |
| commit | 2ca006f6c179b77ad954d883d0a92d05011640f4 (patch) | |
| tree | dbbc45bacfdcb099ea8a168cd5a078b0a09e3c8d /source/blender/draw/intern/draw_manager.c | |
| parent | 43d41675a4e5f2621285c9eeac6737c83bf44923 (diff) | |
| parent | 87062d4d670c01c9c0835057aaf4164aea971e00 (diff) | |
Merge branch 'blender-v2.90-release'
Diffstat (limited to 'source/blender/draw/intern/draw_manager.c')
| -rw-r--r-- | source/blender/draw/intern/draw_manager.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 61c9bf65507..ede589f5bba 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -2719,6 +2719,12 @@ void DRW_render_context_enable(Render *render) WM_init_opengl(); } + if (GPU_use_main_context_workaround()) { + GPU_context_main_lock(); + DRW_opengl_context_enable(); + return; + } + void *re_gl_context = RE_gl_context_get(render); /* Changing Context */ @@ -2736,6 +2742,12 @@ void DRW_render_context_enable(Render *render) void DRW_render_context_disable(Render *render) { + if (GPU_use_main_context_workaround()) { + DRW_opengl_context_disable(); + GPU_context_main_unlock(); + return; + } + void *re_gl_context = RE_gl_context_get(render); if (re_gl_context != NULL) { |