diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-05-26 10:55:34 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-05-26 10:55:34 +0300 |
| commit | de0c269c2803cfe94859f84673f5eb18eea310c0 (patch) | |
| tree | 247b5bd4443f0ec62365d717ee7d0fc7c17db6a5 /release | |
| parent | 2c3c477223dfb45df50e6dcac3fd3712c3cf1fb3 (diff) | |
Fix T44821: Making warp shortcut fails
Using OBJECT prefix for editmode operators causes
shortcuts to go into the wrong keymap.
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 6 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d_toolbar.py | 12 |
2 files changed, 10 insertions, 8 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index cd2ec3e1eae..4bbd3cc8f5f 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -208,8 +208,10 @@ class VIEW3D_MT_transform_base(Menu): layout.operator("transform.shear", text="Shear") layout.operator("transform.bend", text="Bend") layout.operator("transform.push_pull", text="Push/Pull") - layout.operator("object.vertex_warp", text="Warp") - layout.operator("object.vertex_random", text="Randomize") + + if context.mode != 'OBJECT': + layout.operator("transform.vertex_warp", text="Warp") + layout.operator("transform.vertex_random", text="Randomize") # Generic transform menu - geometry types diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index c98bddc49e1..362b7b01120 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -315,7 +315,7 @@ class VIEW3D_PT_tools_meshedit(View3DPanel, Panel): row.operator("transform.vert_slide", text="Vertex") col.operator("mesh.noise") col.operator("mesh.vertices_smooth") - col.operator("object.vertex_random") + col.operator("transform.vertex_random") col = layout.column(align=True) col.label(text="Add:") @@ -523,7 +523,7 @@ class VIEW3D_PT_tools_curveedit(View3DPanel, Panel): col.operator("curve.extrude_move", text="Extrude") col.operator("curve.subdivide") col.operator("curve.smooth") - col.operator("object.vertex_random") + col.operator("transform.vertex_random") class VIEW3D_PT_tools_add_curve_edit(View3DPanel, Panel): @@ -578,7 +578,7 @@ class VIEW3D_PT_tools_surfaceedit(View3DPanel, Panel): col = layout.column(align=True) col.label(text="Deform:") - col.operator("object.vertex_random") + col.operator("transform.vertex_random") class VIEW3D_PT_tools_add_surface_edit(View3DPanel, Panel): @@ -655,7 +655,7 @@ class VIEW3D_PT_tools_armatureedit(View3DPanel, Panel): col = layout.column(align=True) col.label(text="Deform:") - col.operator("object.vertex_random") + col.operator("transform.vertex_random") class VIEW3D_PT_tools_armatureedit_options(View3DPanel, Panel): @@ -688,7 +688,7 @@ class VIEW3D_PT_tools_mballedit(View3DPanel, Panel): col = layout.column(align=True) col.label(text="Deform:") - col.operator("object.vertex_random") + col.operator("transform.vertex_random") class VIEW3D_PT_tools_add_mball_edit(View3DPanel, Panel): @@ -726,7 +726,7 @@ class VIEW3D_PT_tools_latticeedit(View3DPanel, Panel): col = layout.column(align=True) col.label(text="Deform:") - col.operator("object.vertex_random") + col.operator("transform.vertex_random") # ********** default tools for pose-mode **************** |