[Bf-blender-cvs] [caed5b04d21] master: Outliner: rename filter "invisible" to "hidden"

[Nathan Craddock]

Commit: caed5b04d2116acc9973b90c444d52190755c404
Author: Nathan Craddock
Date:   Mon Aug 19 08:20:13 2019 -0600
Branches: master
https://developer.blender.org/rBcaed5b04d2116acc9973b90c444d52190755c404

Outliner: rename filter "invisible" to "hidden"

No functional changes. Renames the "invisible" object filter to
"Hidden" to be more consistent.

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

M	source/blender/editors/space_outliner/outliner_tree.c
M	source/blender/makesdna/DNA_space_types.h
M	source/blender/makesrna/intern/rna_space.c

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

diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index ec5510cdf84..3c693cc5e2b 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -2008,8 +2008,8 @@ static int outliner_exclude_filter_get(SpaceOutliner *soops)
     case SO_FILTER_OB_VISIBLE:
       exclude_filter |= SO_FILTER_OB_STATE_VISIBLE;
       break;
-    case SO_FILTER_OB_INVISIBLE:
-      exclude_filter |= SO_FILTER_OB_STATE_INVISIBLE;
+    case SO_FILTER_OB_HIDDEN:
+      exclude_filter |= SO_FILTER_OB_STATE_HIDDEN;
       break;
     case SO_FILTER_OB_SELECTED:
       exclude_filter |= SO_FILTER_OB_STATE_SELECTED;
@@ -2089,7 +2089,7 @@ static bool outliner_element_visible_get(ViewLayer *view_layer,
           return false;
         }
       }
-      else if (exclude_filter & SO_FILTER_OB_STATE_INVISIBLE) {
+      else if (exclude_filter & SO_FILTER_OB_STATE_HIDDEN) {
         if ((base->flag & BASE_VISIBLE) != 0) {
           return false;
         }
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 67f058c298b..ad846fd0476 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -287,11 +287,11 @@ typedef enum eSpaceOutliner_Filter {
   SO_FILTER_NO_OB_CAMERA = (1 << 10),
   SO_FILTER_NO_OB_OTHERS = (1 << 11),
 
-  SO_FILTER_UNUSED_12 = (1 << 12),          /* cleared */
-  SO_FILTER_OB_STATE_VISIBLE = (1 << 13),   /* Not set via DNA. */
-  SO_FILTER_OB_STATE_INVISIBLE = (1 << 14), /* Not set via DNA. */
-  SO_FILTER_OB_STATE_SELECTED = (1 << 15),  /* Not set via DNA. */
-  SO_FILTER_OB_STATE_ACTIVE = (1 << 16),    /* Not set via DNA. */
+  SO_FILTER_UNUSED_12 = (1 << 12),         /* cleared */
+  SO_FILTER_OB_STATE_VISIBLE = (1 << 13),  /* Not set via DNA. */
+  SO_FILTER_OB_STATE_HIDDEN = (1 << 14),   /* Not set via DNA. */
+  SO_FILTER_OB_STATE_SELECTED = (1 << 15), /* Not set via DNA. */
+  SO_FILTER_OB_STATE_ACTIVE = (1 << 16),   /* Not set via DNA. */
   SO_FILTER_NO_COLLECTION = (1 << 17),
 
   SO_FILTER_ID_TYPE = (1 << 18),
@@ -302,7 +302,7 @@ typedef enum eSpaceOutliner_Filter {
    SO_FILTER_NO_OB_LAMP | SO_FILTER_NO_OB_CAMERA | SO_FILTER_NO_OB_OTHERS)
 
 #define SO_FILTER_OB_STATE \
-  (SO_FILTER_OB_STATE_VISIBLE | SO_FILTER_OB_STATE_INVISIBLE | SO_FILTER_OB_STATE_SELECTED | \
+  (SO_FILTER_OB_STATE_VISIBLE | SO_FILTER_OB_STATE_HIDDEN | SO_FILTER_OB_STATE_SELECTED | \
    SO_FILTER_OB_STATE_ACTIVE)
 
 #define SO_FILTER_ANY \
@@ -313,7 +313,7 @@ typedef enum eSpaceOutliner_Filter {
 typedef enum eSpaceOutliner_StateFilter {
   SO_FILTER_OB_ALL = 0,
   SO_FILTER_OB_VISIBLE = 1,
-  SO_FILTER_OB_INVISIBLE = 2,
+  SO_FILTER_OB_HIDDEN = 2,
   SO_FILTER_OB_SELECTED = 3,
   SO_FILTER_OB_ACTIVE = 4,
 } eSpaceOutliner_StateFilter;
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index ef4406db84d..645373c5795 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -2777,7 +2777,7 @@ static void rna_def_space_outliner(BlenderRNA *brna)
   static const EnumPropertyItem filter_state_items[] = {
       {SO_FILTER_OB_ALL, "ALL", 0, "All", "Show all objects in the view layer"},
       {SO_FILTER_OB_VISIBLE, "VISIBLE", 0, "Visible", "Show visible objects"},
-      {SO_FILTER_OB_INVISIBLE, "INVISIBLE", 0, "Invisible", "Show invisible objects"},
+      {SO_FILTER_OB_HIDDEN, "HIDDEN", 0, "Hidden", "Show hidden objects"},
       {SO_FILTER_OB_SELECTED, "SELECTED", 0, "Selected", "Show selected objects"},
       {SO_FILTER_OB_ACTIVE, "ACTIVE", 0, "Active", "Show only the active object"},
       {0, NULL, 0, NULL, NULL},