diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2020-04-27 22:15:11 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2020-04-27 22:15:11 +0300 |
| commit | fd0cb5812262a4d20c051a25e2c1c2c96808bc80 (patch) | |
| tree | de321539810203be632520f0b82e8f223d266ebc /source/blender/windowmanager | |
| parent | 6830307b946d16677fee79785c7c35a4ff97c61a (diff) | |
| parent | 133bf05b184bfeed3002be28c29199b5716b8f1e (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/WM_api.h | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_draw.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h index 4118794d5b3..2f540262a66 100644 --- a/source/blender/windowmanager/WM_api.h +++ b/source/blender/windowmanager/WM_api.h @@ -773,7 +773,7 @@ void WM_draw_region_viewport_bind(struct ARegion *region); void WM_draw_region_viewport_unbind(struct ARegion *region); /* Region drawing */ -void WM_draw_region_free(struct ARegion *region); +void WM_draw_region_free(struct ARegion *region, bool hide); struct GPUViewport *WM_draw_region_get_viewport(struct ARegion *region); struct GPUViewport *WM_draw_region_get_bound_viewport(struct ARegion *region); diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c index d3cd31c6e97..302de6609d0 100644 --- a/source/blender/windowmanager/intern/wm_draw.c +++ b/source/blender/windowmanager/intern/wm_draw.c @@ -1037,10 +1037,12 @@ void wm_draw_region_clear(wmWindow *win, ARegion *UNUSED(region)) screen->do_draw = true; } -void WM_draw_region_free(ARegion *region) +void WM_draw_region_free(ARegion *region, bool hide) { wm_draw_region_buffer_free(region); - region->visible = 0; + if (hide) { + region->visible = 0; + } } void wm_draw_region_test(bContext *C, ScrArea *area, ARegion *region) |