diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2018-10-01 19:53:23 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2018-10-01 19:56:26 +0300 |
| commit | 8ed17c37c5b0da5ddab8eca468b59ee22b119082 (patch) | |
| tree | 315037f1016e4d56f74d8070759416b29256f2b3 /source | |
| parent | 238d30169f35cd820379890e5b1d047ea89c06a5 (diff) | |
DRW: Fix unselectable wire object in solid mode
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/draw/intern/draw_manager.c | 1 | ||||
| -rw-r--r-- | source/blender/draw/modes/overlay_mode.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 487e1d7a3ac..0566abd3436 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -2055,6 +2055,7 @@ void DRW_draw_select_loop( } else { drw_engines_enable_basic(); + drw_engines_enable_from_overlays(v3d->overlay.flag); drw_engines_enable_from_object_mode(); } diff --git a/source/blender/draw/modes/overlay_mode.c b/source/blender/draw/modes/overlay_mode.c index 3eef5a47288..166b2a12d7b 100644 --- a/source/blender/draw/modes/overlay_mode.c +++ b/source/blender/draw/modes/overlay_mode.c @@ -289,9 +289,7 @@ static void overlay_cache_populate(void *vedata, Object *ob) DRWPass *pass = (all_wires) ? psl->face_wireframe_full_pass : psl->face_wireframe_pass; GPUShader *sh = (all_wires) ? e_data.face_wireframe_sh : e_data.face_wireframe_pretty_sh; - if ((DRW_state_is_select() || DRW_state_is_depth()) && - (v3d->shading.flag & XRAY_FLAG(v3d)) != 0) - { + if ((DRW_state_is_select() || DRW_state_is_depth())) { static float params[2] = {1.2f, 1.0f}; /* Parameters for all wires */ sh = e_data.select_wireframe_sh; |