griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

UI: Avoid double separators in some circumstances in the object context menu

Browse Source 
Also make placement of Rename more consistent between object and bones.
This commit is contained in:
William Reynish
2019-03-26 14:48:35 +01:00
parent 5d455a7a90
commit fb96dcd713
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
release/scripts/startup/bl_ui/space_view3d.py
View File

@@ -1833,6 +1833,8 @@ class VIEW3D_MT_object_context_menu(Menu):
if selected_objects_len > 1:
layout.operator("object.join")
layout.separator()
elif obj.type == 'CAMERA':
layout.operator_context = 'INVOKE_REGION_WIN'
@@ -1863,6 +1865,8 @@ class VIEW3D_MT_object_context_menu(Menu):
props.input_scale = 0.02
props.header_text = "DOF Distance: %.3f"
layout.separator()
elif obj.type in {'CURVE', 'FONT'}:
layout.operator_context = 'INVOKE_REGION_WIN'
@@ -1882,6 +1886,8 @@ class VIEW3D_MT_object_context_menu(Menu):
layout.operator_menu_enum("object.origin_set", text="Set Origin", property="type")
layout.separator()
elif obj.type == 'GPENCIL':
layout.operator("gpencil.convert", text="Convert to Path").type = 'PATH'
layout.operator("gpencil.convert", text="Convert to Bezier Curves").type = 'CURVE'
@@ -1889,6 +1895,8 @@ class VIEW3D_MT_object_context_menu(Menu):
layout.operator_menu_enum("object.origin_set", text="Set Origin", property="type")
layout.separator()
elif obj.type == 'EMPTY':
layout.operator_context = 'INVOKE_REGION_WIN'
@@ -1898,6 +1906,8 @@ class VIEW3D_MT_object_context_menu(Menu):
props.input_scale = 0.01
props.header_text = "Empty Draw Size: %.3f"
layout.separator()
elif obj.type == 'LIGHT':
light = obj.data
@@ -1960,13 +1970,7 @@ class VIEW3D_MT_object_context_menu(Menu):
props.input_scale = -0.01
props.header_text = "Spot Blend: %.2f"
layout.separator()
props = layout.operator("wm.call_panel", text="Rename Active Object...")
props.name = "TOPBAR_PT_name"
props.keep_open = False
layout.separator()
layout.separator()
layout.operator("view3d.copybuffer", text="Copy Objects", icon='COPYDOWN')
layout.operator("view3d.pastebuffer", text="Paste Objects", icon='PASTEDOWN')
@@ -1978,6 +1982,12 @@ class VIEW3D_MT_object_context_menu(Menu):
layout.separator()
props = layout.operator("wm.call_panel", text="Rename Active Object...")
props.name = "TOPBAR_PT_name"
props.keep_open = False
layout.separator()
layout.menu("VIEW3D_MT_mirror")
layout.menu("VIEW3D_MT_snap")
layout.menu("VIEW3D_MT_object_parent")