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:
authorHans Goudey <h.goudey@me.com>2020-11-21 00:01:32 +0300
committerHans Goudey <h.goudey@me.com>2020-11-21 00:01:32 +0300
commit2ce1b89d7561cca01f9b36a4b55d6c709c7e5d9d (patch)
tree74e3ff2103ae8580877c2ec74b69852a7b0927b8 /release
parent0649131be763d79af2cc3fc724c6a99910742033 (diff)
parentcec22ba8db7c2400f3a6ab4f50c26baf8f44d455 (diff)
Merge branch 'master' into geometry-nodes
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/space_outliner.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/space_outliner.py b/release/scripts/startup/bl_ui/space_outliner.py
index 47708db6854..16bbbb9566e 100644
--- a/release/scripts/startup/bl_ui/space_outliner.py
+++ b/release/scripts/startup/bl_ui/space_outliner.py
@@ -345,11 +345,9 @@ class OUTLINER_PT_filter(Panel):
if display_mode != 'DATA_API':
col = layout.column(align=True)
col.prop(space, "use_sort_alpha")
- layout.separator()
row = layout.row(align=True)
row.prop(space, "use_sync_select", text="Sync Selection")
- layout.separator()
row = layout.row(align=True)
row.prop(space, "show_mode_column", text="Show Mode Column")
@@ -372,10 +370,16 @@ class OUTLINER_PT_filter(Panel):
row = col.row()
row.label(icon='OUTLINER_COLLECTION')
row.prop(space, "use_filter_collection", text="Collections")
+
row = col.row()
row.label(icon='OBJECT_DATAMODE')
row.prop(space, "use_filter_object", text="Objects")
+ row = col.row(align=True)
+ row.label(icon="BLANK1")
row.prop(space, "filter_state", text="")
+ sub = row.row(align=True)
+ sub.enabled = space.filter_state != 'ALL'
+ sub.prop(space, "filter_invert", text="", icon="ARROW_LEFTRIGHT")
sub = col.column(align=True)
sub.active = space.use_filter_object