diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-30 01:06:36 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-30 01:06:36 +0300 |
| commit | 8c9d632128d89ef48fdb560289a3f1553b811340 (patch) | |
| tree | 22d0632d74b38c395705948678bee603e67bc176 /release | |
| parent | bb4e53faf279493534e21db8b95be0f86b9fb63a (diff) | |
Cleanup: de-duplicate default object tools
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_toolsystem_toolbar.py | 66 |
1 files changed, 17 insertions, 49 deletions
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index 3729776b66e..591a17db4a5 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -1420,6 +1420,15 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel): ), ) + _tools_default = ( + *_tools_select, + _defs_view3d_generic.cursor, + None, + *_tools_transform, + None, + *_tools_annotate, + ) + _tools = { None: [ # Don't use this! because of paint modes. @@ -1427,20 +1436,10 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel): # End group. ], 'OBJECT': [ - *_tools_select, - _defs_view3d_generic.cursor, - None, - *_tools_transform, - None, - *_tools_annotate, + *_tools_default, ], 'POSE': [ - *_tools_select, - _defs_view3d_generic.cursor, - None, - *_tools_transform, - None, - *_tools_annotate, + *_tools_default, None, ( _defs_pose.breakdown, @@ -1449,12 +1448,8 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel): ), ], 'EDIT_ARMATURE': [ - *_tools_select, - _defs_view3d_generic.cursor, + *_tools_default, None, - *_tools_transform, - None, - *_tools_annotate, _defs_edit_armature.roll, ( _defs_edit_armature.bone_size, @@ -1467,12 +1462,7 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel): ), ], 'EDIT_MESH': [ - *_tools_select, - _defs_view3d_generic.cursor, - None, - *_tools_transform, - None, - *_tools_annotate, + *_tools_default, None, _defs_edit_mesh.cube_add, None, @@ -1519,12 +1509,7 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel): ), ], 'EDIT_CURVE': [ - *_tools_select, - _defs_view3d_generic.cursor, - None, - *_tools_transform, - None, - *_tools_annotate, + *_tools_default, None, _defs_edit_curve.tilt, _defs_edit_curve.draw, @@ -1534,30 +1519,13 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel): ), ], 'EDIT_SURFACE': [ - *_tools_select, - _defs_view3d_generic.cursor, - None, - *_tools_transform, - None, - *_tools_annotate, + *_tools_default, ], 'EDIT_METABALL': [ - *_tools_select, - _defs_view3d_generic.cursor, - None, - *_tools_transform, - None, - *_tools_annotate, - None, + *_tools_default, ], 'EDIT_LATTICE': [ - *_tools_select, - _defs_view3d_generic.cursor, - None, - *_tools_transform, - None, - *_tools_annotate, - None, + *_tools_default, ], 'PARTICLE': [ _defs_view3d_generic.cursor, |