diff options
author | Nathan Craddock <nzcraddock@gmail.com> | 2019-08-08 07:27:07 +0300 |
---|---|---|
committer | Nathan Craddock <nzcraddock@gmail.com> | 2019-08-16 21:30:53 +0300 |
commit | 71eb65328078d3b3ca440a9a23a7aa08238a6710 (patch) | |
tree | eae7a6c557af86911d867f4644a24a618394dc9a /release | |
parent | 7ba2720a70c83eb41f577aae4eb5a3403f6bb6b9 (diff) |
Outliner: Synced selection and active element highlighting
Adds a toggle to the filter menu for outliner synced selection. Enabled
by default, this ensures selection is synced between objects, bones, and
sequences. An active outliner element theme color is added to indicate
which element is active.
Synced selection is controlled on the operator level. Each operator
that modifies selection for objects, bones, sequences, or outliner
elements needs to call the respective ED_outliner_select_sync_from..
function to tag outliners to be synced.
Syncing is done lazily on outliner draw.
Diffstat (limited to 'release')
-rw-r--r-- | release/datafiles/userdef/userdef_default_theme.c | 3 | ||||
-rw-r--r-- | release/scripts/presets/interface_theme/blender_light.xml | 1 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_outliner.py | 8 |
3 files changed, 11 insertions, 1 deletions
diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c index 8611a9ae881..9f037fa4793 100644 --- a/release/datafiles/userdef/userdef_default_theme.c +++ b/release/datafiles/userdef/userdef_default_theme.c @@ -748,7 +748,8 @@ const bTheme U_theme_default = { .outline_width = 1, .facedot_size = 4, .match = RGBA(0x337f334c), - .selected_highlight = RGBA(0x314e784c), + .selected_highlight = RGBA(0x223a5bff), + .active = RGBA(0x3b5689ff), .selected_object = RGBA(0xe96a00ff), .active_object = RGBA(0xffaf29ff), .edited_object = RGBA(0x00806266), diff --git a/release/scripts/presets/interface_theme/blender_light.xml b/release/scripts/presets/interface_theme/blender_light.xml index dc0bb6b629e..49b01ec3309 100644 --- a/release/scripts/presets/interface_theme/blender_light.xml +++ b/release/scripts/presets/interface_theme/blender_light.xml @@ -974,6 +974,7 @@ <ThemeOutliner match="#337f33" selected_highlight="#7a8e99" + active="#92aab7" selected_object="#ffddb3" active_object="#ffffff" edited_object="#0080624d" diff --git a/release/scripts/startup/bl_ui/space_outliner.py b/release/scripts/startup/bl_ui/space_outliner.py index 6832e3d463b..7bf203d8e39 100644 --- a/release/scripts/startup/bl_ui/space_outliner.py +++ b/release/scripts/startup/bl_ui/space_outliner.py @@ -46,6 +46,10 @@ class OUTLINER_HT_header(Header): layout.separator_spacer() + if display_mode == 'SEQUENCE': + row = layout.row(align=True) + row.prop(space, "use_sync_select", icon="UV_SYNC_SELECT", text="") + row = layout.row(align=True) if display_mode in {'SCENES', 'VIEW_LAYER'}: row.popover( @@ -328,6 +332,10 @@ class OUTLINER_PT_filter(Panel): col.prop(space, "use_sort_alpha") layout.separator() + row = layout.row(align=True) + row.prop(space, "use_sync_select", text="Sync Selection") + layout.separator() + col = layout.column(align=True) col.label(text="Search:") col.prop(space, "use_filter_complete", text="Exact Match") |