diff options
author | Julian Eisel <julian@blender.org> | 2020-07-01 18:13:57 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-07-01 18:13:57 +0300 |
commit | 0829cebeb024095c268f190c34daa8ae9a5a224c (patch) | |
tree | 12ee5a4a1c2a32e12eff47c8eb9bb0ed217791c1 /release/scripts/startup/bl_ui/space_outliner.py | |
parent | cfde6ebf450594faa57c4bfeaecff10fe512c91b (diff) | |
parent | 42be3964eb201180f6b0fa1ff6ce43b8c3845bc2 (diff) |
Merge branch 'master' into asset-uuid--archivedasset-uuid--archived
Diffstat (limited to 'release/scripts/startup/bl_ui/space_outliner.py')
-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() |