[Bf-blender-cvs] [c63df3b33f0] blender-v2.92-release: UI: Clarify descriptions in properties popover

[Nathan Craddock]

Commit: c63df3b33f011d524fc8dd1b8fc28f896e876a99
Author: Nathan Craddock
Date:   Tue Jan 5 13:55:32 2021 -0700
Branches: blender-v2.92-release
https://developer.blender.org/rBc63df3b33f011d524fc8dd1b8fc28f896e876a99

UI: Clarify descriptions in properties popover

Updates the descriptions and labels for outliner sync in the properties
editor popover to be more clear.

Differential Revision: https://developer.blender.org/D10010

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

M	release/scripts/startup/bl_ui/space_properties.py
M	source/blender/editors/space_buttons/buttons_context.c
M	source/blender/makesdna/DNA_space_types.h
M	source/blender/makesrna/intern/rna_space.c

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

diff --git a/release/scripts/startup/bl_ui/space_properties.py b/release/scripts/startup/bl_ui/space_properties.py
index b2a7246af75..053df113dd7 100644
--- a/release/scripts/startup/bl_ui/space_properties.py
+++ b/release/scripts/startup/bl_ui/space_properties.py
@@ -74,7 +74,7 @@ class PROPERTIES_PT_navigation_bar(Panel):
 class PROPERTIES_PT_options(Panel):
     bl_space_type = 'PROPERTIES'
     bl_region_type = 'HEADER'
-    bl_label = 'Options'
+    bl_label = 'Show options for the properties editor'
 
     def draw(self, context):
         layout = self.layout
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c
index e2b889bece1..76c0fc07429 100644
--- a/source/blender/editors/space_buttons/buttons_context.c
+++ b/source/blender/editors/space_buttons/buttons_context.c
@@ -759,7 +759,7 @@ bool ED_buttons_should_sync_with_outliner(const bContext *C,
   ScrArea *active_area = CTX_wm_area(C);
   const bool auto_sync = ED_area_has_shared_border(active_area, area) &&
                          sbuts->outliner_sync == PROPERTIES_SYNC_AUTO;
-  return auto_sync || sbuts->outliner_sync == PROPERTIES_SYNC_ON;
+  return auto_sync || sbuts->outliner_sync == PROPERTIES_SYNC_ALWAYS;
 }
 
 void ED_buttons_set_context(const bContext *C,
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 03f5d3f8d47..13989467db3 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -238,8 +238,8 @@ typedef enum eSpaceButtons_Flag {
 /* SpaceProperties.outliner_sync */
 typedef enum eSpaceButtons_OutlinerSync {
   PROPERTIES_SYNC_AUTO = 0,
-  PROPERTIES_SYNC_OFF = 1,
-  PROPERTIES_SYNC_ON = 2,
+  PROPERTIES_SYNC_NEVER = 1,
+  PROPERTIES_SYNC_ALWAYS = 2,
 } eSpaceButtons_OutlinerSync;
 
 /** \} */
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 251845ee5b0..f5abe681d91 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -4787,13 +4787,21 @@ static void rna_def_space_properties(BlenderRNA *brna)
   PropertyRNA *prop;
 
   static const EnumPropertyItem tab_sync_items[] = {
-      {PROPERTIES_SYNC_ON, "ON", 0, "On", "Always sync from outliner editors to this editor"},
-      {PROPERTIES_SYNC_OFF, "OFF", 0, "Off", "Never sync from outliner editors to this editor"},
+      {PROPERTIES_SYNC_ALWAYS,
+       "ALWAYS",
+       0,
+       "Always",
+       "Always change tabs when clicking an icon in an outliner"},
+      {PROPERTIES_SYNC_NEVER,
+       "NEVER",
+       0,
+       "Never",
+       "Never change tabs when clicking an icon in an outliner"},
       {PROPERTIES_SYNC_AUTO,
        "AUTO",
        0,
        "Auto",
-       "Sync when this editor shares an edge with an outliner editor"},
+       "Change tabs only when this editor shares a border the outliner"},
       {0, NULL, 0, NULL, NULL},
   };
 
@@ -4852,7 +4860,9 @@ static void rna_def_space_properties(BlenderRNA *brna)
   prop = RNA_def_property(srna, "outliner_sync", PROP_ENUM, PROP_NONE);
   RNA_def_property_enum_sdna(prop, NULL, "outliner_sync");
   RNA_def_property_enum_items(prop, tab_sync_items);
-  RNA_def_property_ui_text(prop, "Outliner Sync", "Sync tabs from outliner datablock selection");
+  RNA_def_property_ui_text(prop,
+                           "Outliner Sync",
+                           "Change to the corresponding tab when outliner data icons are clicked");
   RNA_def_property_update(prop, NC_SPACE | ND_SPACE_PROPERTIES, NULL);
 }