diff options
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 4 | ||||
| -rw-r--r-- | source/blender/draw/modes/edit_mesh_mode.c | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 5351fe07ed3..6771ddef9e9 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -2099,7 +2099,7 @@ class VIEW3D_MT_object_relations(Menu): layout = self.layout layout.operator("object.proxy_make", text="Make Proxy...") - + if bpy.app.use_override_library: layout.operator("object.make_override_library", text="Make Library Override...") @@ -5613,6 +5613,7 @@ class VIEW3D_PT_overlay_edit_mesh(Panel): layout = self.layout view = context.space_data + shading = view.shading overlay = view.overlay display_all = overlay.show_overlays @@ -5622,6 +5623,7 @@ class VIEW3D_PT_overlay_edit_mesh(Panel): split = col.split() sub = split.column() + sub.active = not ((shading.type == 'WIREFRAME') or shading.show_xray) sub.prop(overlay, "show_edges", text="Edges") sub = split.column() sub.prop(overlay, "show_faces", text="Faces") diff --git a/source/blender/draw/modes/edit_mesh_mode.c b/source/blender/draw/modes/edit_mesh_mode.c index f8247d7929e..b76c17b981b 100644 --- a/source/blender/draw/modes/edit_mesh_mode.c +++ b/source/blender/draw/modes/edit_mesh_mode.c @@ -459,7 +459,12 @@ static void EDIT_MESH_cache_init(void *vedata) } if ((v3d->overlay.edit_flag & V3D_OVERLAY_EDIT_EDGES) == 0) { if ((tsettings->selectmode & SCE_SELECT_EDGE) == 0) { - g_data->do_edges = false; + if ((v3d->shading.type < OB_SOLID) || (v3d->shading.flag & V3D_SHADING_XRAY)) { + /* Special case, when drawing wire, draw edges, see: T67637. */ + } + else { + g_data->do_edges = false; + } } } if ((v3d->overlay.edit_flag & V3D_OVERLAY_EDIT_CREASES) == 0) { |