[Bf-blender-cvs] [1e9f84c0d3e] temp-soc-2019-outliner-sync: Outliner: Move synced select toggle

[Nathan Craddock]

Commit: 1e9f84c0d3e2c797c7a7b287f3d02daeb8feac25
Author: Nathan Craddock
Date:   Fri Aug 16 10:57:46 2019 -0600
Branches: temp-soc-2019-outliner-sync
https://developer.blender.org/rB1e9f84c0d3e2c797c7a7b287f3d02daeb8feac25

Outliner: Move synced select toggle

Move below Sort Alphabetically and use a checkbox instead of
a button.

===================================================================

M	release/scripts/startup/bl_ui/space_outliner.py
M	source/blender/makesrna/intern/rna_space.c

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_outliner.py b/release/scripts/startup/bl_ui/space_outliner.py
index f3e8d322a7b..7bf203d8e39 100644
--- a/release/scripts/startup/bl_ui/space_outliner.py
+++ b/release/scripts/startup/bl_ui/space_outliner.py
@@ -48,7 +48,7 @@ class OUTLINER_HT_header(Header):
 
         if display_mode == 'SEQUENCE':
             row = layout.row(align=True)
-            row.prop(space, "use_sync_select", text="")
+            row.prop(space, "use_sync_select", icon="UV_SYNC_SELECT", text="")
 
         row = layout.row(align=True)
         if display_mode in {'SCENES', 'VIEW_LAYER'}:
@@ -307,10 +307,6 @@ class OUTLINER_PT_filter(Panel):
         space = context.space_data
         display_mode = space.display_mode
 
-        row = layout.row(align=True)
-        row.prop(space, "use_sync_select", text="Sync Selection")
-        layout.separator()
-
         if display_mode == 'VIEW_LAYER':
             layout.label(text="Restriction Toggles:")
             row = layout.row(align=True)
@@ -336,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")
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 3aeaf0ba397..ef4406db84d 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -2820,7 +2820,6 @@ static void rna_def_space_outliner(BlenderRNA *brna)
   RNA_def_property_boolean_sdna(prop, NULL, "flag", SO_SYNC_SELECT);
   RNA_def_property_ui_text(
       prop, "Sync Outliner Selection", "Sync outliner selection with other editors");
-  RNA_def_property_ui_icon(prop, ICON_UV_SYNC_SELECT, 0);
   RNA_def_property_update(prop, NC_SPACE | ND_SPACE_OUTLINER, NULL);
 
   /* Granular restriction column option. */