Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Eisel <eiseljulian@gmail.com>2017-02-28 00:17:19 +0300
committerJulian Eisel <eiseljulian@gmail.com>2017-02-28 00:24:59 +0300
commit5138fe3c0a24d5890438eed90a70401d90423356 (patch)
tree1ebe19822d6e00dd4d4d2728baba476e04b0c3e7 /release
parentc24b4e0cd0f95687ced252477232166dd53a341b (diff)
Outliner: "All Collections" mode showing the master collection hierarchy
Reordering is disabled for now. Link, unlink and override operators are only available while in "Active Layer" mode, not in "All Collections".
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/space_outliner.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/release/scripts/startup/bl_ui/space_outliner.py b/release/scripts/startup/bl_ui/space_outliner.py
index a8ef0c1a8a8..6af522e59e2 100644
--- a/release/scripts/startup/bl_ui/space_outliner.py
+++ b/release/scripts/startup/bl_ui/space_outliner.py
@@ -60,13 +60,14 @@ class OUTLINER_HT_header(Header):
elif space.display_mode == 'ORPHAN_DATA':
layout.operator("outliner.orphans_purge")
- elif space.display_mode == 'ACT_LAYER':
+ elif space.display_mode in {'ACT_LAYER', 'COLLECTIONS'}:
row = layout.row(align=True)
row.operator("outliner.collection_new", text="", icon='NEW')
- row.operator("outliner.collection_override_new", text="", icon='LINK_AREA')
- row.operator("outliner.collection_link", text="", icon='LINKED')
- row.operator("outliner.collection_unlink", text="", icon='UNLINKED')
+ if space.display_mode == 'ACT_LAYER':
+ row.operator("outliner.collection_override_new", text="", icon='LINK_AREA')
+ row.operator("outliner.collection_link", text="", icon='LINKED')
+ row.operator("outliner.collection_unlink", text="", icon='UNLINKED')
row.operator("outliner.collection_delete", text="", icon='X')