[Bf-blender-cvs] [40e8b9775d3] master: Fix: Missing changes in recent "Curves" rename

[Hans Goudey]

Commit: 40e8b9775d34301595f18d9bf0b35e3ada545a1d
Author: Hans Goudey
Date:   Thu Feb 10 15:51:00 2022 -0600
Branches: master
https://developer.blender.org/rB40e8b9775d34301595f18d9bf0b35e3ada545a1d

Fix: Missing changes in recent "Curves" rename

More missing changes in fe1816f67fbc6aaf3. This will hopefully fix a
Python API docs build error, and fixes the "Object Types Visibility"
popover.

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

M	doc/python_api/sphinx_doc_gen.py
M	release/scripts/startup/bl_ui/space_view3d.py
M	source/blender/makesrna/intern/rna_space.c

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

diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py
index 2133f5fcb9f..f8ccb10a844 100644
--- a/doc/python_api/sphinx_doc_gen.py
+++ b/doc/python_api/sphinx_doc_gen.py
@@ -1078,7 +1078,7 @@ context_type_map = {
     "gpencil": ("GreasePencil", False),
     "gpencil_data": ("GreasePencil", False),
     "gpencil_data_owner": ("ID", False),
-    "hair": ("Hair", False),
+    "curves": ("Hair Curves", False),
     "id": ("ID", False),
     "image_paint_object": ("Object", False),
     "lattice": ("Lattice", False),
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index ea7a1885369..a8a26edc554 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -5628,7 +5628,7 @@ class VIEW3D_PT_object_type_visibility(Panel):
             ("surf", "Surface"),
             ("meta", "Meta"),
             ("font", "Text"),
-            ("hair", "Hair"),
+            ("curves", "Hair Curves"),
             ("pointcloud", "Point Cloud"),
             ("volume", "Volume"),
             ("grease_pencil", "Grease Pencil"),
@@ -5648,7 +5648,7 @@ class VIEW3D_PT_object_type_visibility(Panel):
                 col.separator()
                 continue
 
-            if attr == "hair" and not hasattr(bpy.data, "hairs"):
+            if attr == "curves" and not hasattr(bpy.data, "hair_curves"):
                 continue
             elif attr == "pointcloud" and not hasattr(bpy.data, "pointclouds"):
                 continue
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 07521d39256..987660a80ab 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -5004,7 +5004,9 @@ static void rna_def_space_view3d(BlenderRNA *brna)
         {"Surface", (1 << OB_SURF), {"show_object_viewport_surf", "show_object_select_surf"}},
         {"Meta", (1 << OB_MBALL), {"show_object_viewport_meta", "show_object_select_meta"}},
         {"Font", (1 << OB_FONT), {"show_object_viewport_font", "show_object_select_font"}},
-        {"Hair", (1 << OB_CURVES), {"show_object_viewport_hair", "show_object_select_hair"}},
+        {"Hair Curves",
+         (1 << OB_CURVES),
+         {"show_object_viewport_curves", "show_object_select_curves"}},
         {"Point Cloud",
          (1 << OB_POINTCLOUD),
          {"show_object_viewport_pointcloud", "show_object_select_pointcloud"}},