diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2020-04-23 19:26:22 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2020-04-23 19:26:22 +0300 |
| commit | 7d98dfd6bb3921e661f5ba5adb04ffd9876395f1 (patch) | |
| tree | c97fc60a92a7966bb59edb23e3e8400aad5591be /source/blender/windowmanager | |
| parent | 5e045485009c93d845ff0295066aa45297c1bc1a (diff) | |
| parent | 0fbcb824d0ff1673ad186055a472b977406fb61d (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_draw.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c index d887d9b0eee..d3cd31c6e97 100644 --- a/source/blender/windowmanager/intern/wm_draw.c +++ b/source/blender/windowmanager/intern/wm_draw.c @@ -84,6 +84,13 @@ static void wm_paintcursor_draw(bContext *C, ScrArea *area, ARegion *region) bScreen *screen = WM_window_get_active_screen(win); wmPaintCursor *pc; + /* Don't draw paint cursors with locked interface. Painting is not possible + * then, and cursor drawing can use scene data that another thread may be + * modifying. */ + if (wm->is_interface_locked) { + return; + } + if (region->visible && region == screen->active_region) { for (pc = wm->paintcursors.first; pc; pc = pc->next) { |