diff options
author | Nathan Craddock <nzcraddock@gmail.com> | 2020-06-17 18:00:04 +0300 |
---|---|---|
committer | Nathan Craddock <nzcraddock@gmail.com> | 2020-06-17 18:00:04 +0300 |
commit | 26c0ca3aa7f4f6e3836aac1636bf60c302afd12e (patch) | |
tree | ef619810da2a7c1ff2e0b9d2900b800f9e188fb5 /release | |
parent | a2c4e5d2220f8e395fe65e8e895e2813a984d6ff (diff) |
Outliner: Unified delete hierarchy operator
This resolves T73673 by allowing delete hierarchy in all outliner view
modes. It also unifies the collection and object hierarchy delete into a
single operator like in rBae98a033c856. This makes it easier to delete
all selected collection and object hierarchies at once.
This also removes the old object delete hierarchy code in favor of the
batch delete code which has been default for over a year.
Maniphest Tasks: T73673
Differential Revision: https://developer.blender.org/D7675
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_ui/space_outliner.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/release/scripts/startup/bl_ui/space_outliner.py b/release/scripts/startup/bl_ui/space_outliner.py index ee8015df273..aa4d0b94b7f 100644 --- a/release/scripts/startup/bl_ui/space_outliner.py +++ b/release/scripts/startup/bl_ui/space_outliner.py @@ -213,7 +213,7 @@ class OUTLINER_MT_collection(Menu): layout.separator() layout.operator("outliner.delete", text="Delete", icon='X') - layout.operator("outliner.collection_hierarchy_delete") + layout.operator("outliner.delete", text="Delete Hierarchy").hierarchy = True layout.separator() @@ -279,9 +279,7 @@ class OUTLINER_MT_object(Menu): layout.separator() layout.operator("outliner.delete", text="Delete", icon='X') - - if space.display_mode == 'VIEW_LAYER' and not space.use_filter_collection: - layout.operator("outliner.object_operation", text="Delete Hierarchy").type = 'DELETE_HIERARCHY' + layout.operator("outliner.delete", text="Delete Hierarchy").hierarchy = True layout.separator() |