Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <jeroen@blender.org>2020-08-05 16:59:04 +0300
committerJeroen Bakker <jeroen@blender.org>2020-08-05 16:59:04 +0300
commit2ca006f6c179b77ad954d883d0a92d05011640f4 (patch)
treedbbc45bacfdcb099ea8a168cd5a078b0a09e3c8d /source/blender/windowmanager/intern/wm_draw.c
parent43d41675a4e5f2621285c9eeac6737c83bf44923 (diff)
parent87062d4d670c01c9c0835057aaf4164aea971e00 (diff)
Merge branch 'blender-v2.90-release'
Diffstat (limited to 'source/blender/windowmanager/intern/wm_draw.c')
-rw-r--r--source/blender/windowmanager/intern/wm_draw.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c
index 4db6eb6af91..190db919b41 100644
--- a/source/blender/windowmanager/intern/wm_draw.c
+++ b/source/blender/windowmanager/intern/wm_draw.c
@@ -51,6 +51,7 @@
#include "ED_screen.h"
#include "ED_view3d.h"
+#include "GPU_context.h"
#include "GPU_framebuffer.h"
#include "GPU_immediate.h"
#include "GPU_state.h"
@@ -998,6 +999,7 @@ void wm_draw_update(bContext *C)
wmWindowManager *wm = CTX_wm_manager(C);
wmWindow *win;
+ GPU_context_main_lock();
BKE_image_free_unused_gpu_textures();
for (win = wm->windows.first; win; win = win->next) {
@@ -1035,6 +1037,8 @@ void wm_draw_update(bContext *C)
/* Draw non-windows (surfaces) */
wm_surfaces_iter(C, wm_draw_surface);
+
+ GPU_context_main_unlock();
}
void wm_draw_region_clear(wmWindow *win, ARegion *UNUSED(region))