diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-05 15:24:58 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-05 15:54:52 +0300 |
| commit | 2891fb645b95ca45ee5ace1d51221e5b3ea52dae (patch) | |
| tree | 7a375d7b3b16afa2337c3546d871a335785b48d2 /source/blender/draw/intern/draw_manager.c | |
| parent | 24bd483ee1551e2fb1dadea9fada98045700b5b2 (diff) | |
3D View: disable manipulators & text w/o overlay
Manipulators which aren't explicitly activated via tools are now hidden.
Tool manipulators are kept because it doesn't make sense to interact
with a tool with hidden manipulators.
Diffstat (limited to 'source/blender/draw/intern/draw_manager.c')
| -rw-r--r-- | source/blender/draw/intern/draw_manager.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 3dadb9f9daa..76712c4146e 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -1233,7 +1233,9 @@ void DRW_draw_view(const bContext *C) /* Reset before using it. */ drw_state_prepare_clean_for_draw(&DST); - DST.options.draw_text = (v3d->overlay.flag & V3D_OVERLAY_HIDE_TEXT) != 0; + DST.options.draw_text = ( + (v3d->flag2 & V3D_RENDER_OVERRIDE) == 0 && + (v3d->overlay.flag & V3D_OVERLAY_HIDE_TEXT) != 0); DRW_draw_render_loop_ex(depsgraph, engine_type, ar, v3d, viewport, C); } |