diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2021-02-05 15:07:14 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2021-02-05 15:07:14 +0300 |
| commit | 6b4cd92e4dfbfdd2bcd5557d2506a3bec59cd792 (patch) | |
| tree | e7a6af06df384d70d67591bad6a44f9641d36208 /source/blender/draw | |
| parent | 8c0b0b7c96ed34cc6755c63f951648fada3d59d8 (diff) | |
| parent | 4212ea7b7de70f2346e27505ae7e966a7830f038 (diff) | |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source/blender/draw')
| -rw-r--r-- | source/blender/draw/intern/draw_manager.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 8f8a863f721..fd40d38d238 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -1715,7 +1715,12 @@ void DRW_draw_render_loop_offscreen(struct Depsgraph *depsgraph, GPU_matrix_identity_set(); GPU_matrix_identity_projection_set(); - const bool do_overlays = (v3d->flag2 & V3D_HIDE_OVERLAYS) == 0; + const bool do_overlays = (v3d->flag2 & V3D_HIDE_OVERLAYS) == 0 || + (ELEM(v3d->shading.type, OB_WIRE, OB_SOLID)) || + (ELEM(v3d->shading.type, OB_MATERIAL) && + (v3d->shading.flag & V3D_SHADING_SCENE_WORLD) == 0) || + (ELEM(v3d->shading.type, OB_RENDER) && + (v3d->shading.flag & V3D_SHADING_SCENE_WORLD_RENDER) == 0); GPU_viewport_unbind_from_offscreen(render_viewport, ofs, do_color_management, do_overlays); if (draw_background) { |