diff options
Diffstat (limited to 'release/scripts/startup/bl_ui/space_view3d.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 47 |
1 files changed, 7 insertions, 40 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 5f47aa90026..80cede9ee5a 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -2530,7 +2530,7 @@ class VIEW3D_MT_object_context_menu(Menu): layout.operator_menu_enum("gpencil.convert", "type", text="Convert To") if ( - obj.type in {'MESH', 'CURVE', 'SURFACE', 'GPENCIL', 'LATTICE', 'ARMATURE', 'META'} or + obj.type in {'MESH', 'CURVE', 'SURFACE', 'GPENCIL', 'LATTICE', 'ARMATURE', 'META', 'FONT'} or (obj.type == 'EMPTY' and obj.instance_collection is not None) ): layout.operator_context = 'INVOKE_REGION_WIN' @@ -3727,6 +3727,8 @@ class VIEW3D_MT_edit_mesh_context_menu(Menu): layout = self.layout + with_freestyle = bpy.app.build_options.freestyle + layout.operator_context = 'INVOKE_REGION_WIN' # If nothing is selected @@ -3844,10 +3846,11 @@ class VIEW3D_MT_edit_mesh_context_menu(Menu): col.operator("mesh.mark_sharp") col.operator("mesh.mark_sharp", text="Clear Sharp").clear = True - col.separator() + if with_freestyle: + col.separator() - col.operator("mesh.mark_freestyle_edge").clear = False - col.operator("mesh.mark_freestyle_edge", text="Clear Freestyle Edge").clear = True + col.operator("mesh.mark_freestyle_edge").clear = False + col.operator("mesh.mark_freestyle_edge", text="Clear Freestyle Edge").clear = True col.separator() @@ -4014,38 +4017,6 @@ class VIEW3D_MT_edit_mesh_vertices(Menu): layout.operator("object.vertex_parent_set") -class VIEW3D_MT_edit_mesh_edges_data(Menu): - bl_label = "Edge Data" - - def draw(self, context): - layout = self.layout - - layout.operator_context = 'INVOKE_REGION_WIN' - - layout.operator("transform.edge_crease") - layout.operator("transform.edge_bevelweight") - - layout.separator() - - layout.operator("mesh.mark_seam").clear = False - layout.operator("mesh.mark_seam", text="Clear Seam").clear = True - - layout.separator() - - layout.operator("mesh.mark_sharp") - layout.operator("mesh.mark_sharp", text="Clear Sharp").clear = True - - layout.operator("mesh.mark_sharp", text="Mark Sharp from Vertices").use_verts = True - props = layout.operator("mesh.mark_sharp", text="Clear Sharp from Vertices") - props.use_verts = True - props.clear = True - - layout.separator() - - layout.operator("mesh.mark_freestyle_edge").clear = False - layout.operator("mesh.mark_freestyle_edge", text="Clear Freestyle Edge").clear = True - - class VIEW3D_MT_edit_mesh_edges(Menu): bl_label = "Edge" @@ -6186,9 +6157,6 @@ class VIEW3D_PT_overlay_geometry(Panel): sub.active = overlay.show_fade_inactive sub.prop(overlay, "fade_inactive_alpha", text="Fade Inactive Geometry") - row = col.row(align=True) - row.prop(overlay, "show_mode_transfer", text="Flash on Mode Transfer") - col = layout.column(align=True) col.active = display_all @@ -7609,7 +7577,6 @@ classes = ( VIEW3D_MT_edit_mesh_extrude, VIEW3D_MT_edit_mesh_vertices, VIEW3D_MT_edit_mesh_edges, - VIEW3D_MT_edit_mesh_edges_data, VIEW3D_MT_edit_mesh_faces, VIEW3D_MT_edit_mesh_faces_data, VIEW3D_MT_edit_mesh_normals, |