Commit: 2ca006f6c179b77ad954d883d0a92d05011640f4
Author: Jeroen Bakker
Date: Wed Aug 5 15:59:04 2020 +0200
Branches: master
https://developer.blender.org/rB2ca006f6c179b77ad954d883d0a92d05011640f4
Merge branch 'blender-v2.90-release'
===================================================================
===================================================================
diff --cc source/blender/draw/intern/draw_manager.c
index 61c9bf65507,70c117d55b4..ede589f5bba
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@@ -2716,9 -2716,15 +2716,15 @@@ void DRW_engines_free(void
void DRW_render_context_enable(Render *render)
{
if (G.background && DST.gl_context == NULL) {
- WM_init_opengl(G_MAIN);
+ 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 */
diff --cc source/blender/windowmanager/intern/wm_draw.c
index 4db6eb6af91,fdbc7a7d136..190db919b41
--- a/source/blender/windowmanager/intern/wm_draw.c
+++ b/source/blender/windowmanager/intern/wm_draw.c
@@@ -51,6 -51,8 +51,7 @@@
#include "ED_screen.h"
#include "ED_view3d.h"
+ #include "GPU_context.h"
-#include "GPU_draw.h"
#include "GPU_framebuffer.h"
#include "GPU_immediate.h"
#include "GPU_state.h"
@@@ -998,7 -1000,8 +999,8 @@@ void wm_draw_update(bContext *C
wmWindowManager *wm = CTX_wm_manager(C);
wmWindow *win;
+ GPU_context_main_lock();
- GPU_free_unused_buffers();
+ BKE_image_free_unused_gpu_textures();
for (win = wm->windows.first; win; win = win->next) {
#ifdef WIN32
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
