[Bf-blender-cvs] [dd0df3c5d2b] master: UI: Fix various issues with UI text

Yevgeny Makarov noreply at git.blender.org
Thu Jan 7 05:54:52 CET 2021


Commit: dd0df3c5d2b634ee7fd99f0c0d2e3c6a0c0bdaaf
Author: Yevgeny Makarov
Date:   Wed Jan 6 22:54:10 2021 -0600
Branches: master
https://developer.blender.org/rBdd0df3c5d2b634ee7fd99f0c0d2e3c6a0c0bdaaf

UI: Fix various issues with UI text

 - Use the name "Point Cloud" instead of "Pointcloud"
 - Fix a typo in UV_OT_smart_project.
 - Use the name "Install Light" to for the installation
   operator for MatCaps, HDRIs, and Studio Lights.

Fixes T83585, T65291, and T54921

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

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

M	release/scripts/startup/bl_operators/userpref.py
M	source/blender/editors/object/object_add.c
M	source/blender/editors/uvedit/uvedit_unwrap_ops.c
M	source/blender/makesrna/intern/rna_ID.c
M	source/blender/makesrna/intern/rna_pointcloud.c

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

diff --git a/release/scripts/startup/bl_operators/userpref.py b/release/scripts/startup/bl_operators/userpref.py
index 9adb518ff55..0cd97ca6a9e 100644
--- a/release/scripts/startup/bl_operators/userpref.py
+++ b/release/scripts/startup/bl_operators/userpref.py
@@ -969,9 +969,9 @@ class PREFERENCES_OT_app_template_install(Operator):
 # Studio Light Operations
 
 class PREFERENCES_OT_studiolight_install(Operator):
-    """Install a user defined studio light"""
+    """Install a user defined light"""
     bl_idname = "preferences.studiolight_install"
-    bl_label = "Install Custom Studio Light"
+    bl_label = "Install Light"
 
     files: CollectionProperty(
         name="File Path",
@@ -981,7 +981,7 @@ class PREFERENCES_OT_studiolight_install(Operator):
         subtype='DIR_PATH',
     )
     filter_folder: BoolProperty(
-        name="Filter folders",
+        name="Filter Folders",
         default=True,
         options={'HIDDEN'},
     )
@@ -992,9 +992,9 @@ class PREFERENCES_OT_studiolight_install(Operator):
     type: EnumProperty(
         name="Type",
         items=(
-            ('MATCAP', "MatCap", ""),
-            ('WORLD', "World", ""),
-            ('STUDIO', "Studio", ""),
+            ('MATCAP', "MatCap", "Install custom MatCaps"),
+            ('WORLD', "World", "Install custom HDRIs"),
+            ('STUDIO', "Studio", "Install custom Studio Lights"),
         )
     )
 
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index a01f19f4706..90f9b83ba67 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -2411,7 +2411,7 @@ static const EnumPropertyItem convert_target_items[] = {
      ICON_OUTLINER_OB_MESH,
      "Mesh",
 #ifdef WITH_POINT_CLOUD
-     "Mesh from Curve, Surface, Metaball, Text, or Pointcloud objects"},
+     "Mesh from Curve, Surface, Metaball, Text, or Point Cloud objects"},
 #else
      "Mesh from Curve, Surface, Metaball, or Text objects"},
 #endif
@@ -2424,8 +2424,8 @@ static const EnumPropertyItem convert_target_items[] = {
     {OB_POINTCLOUD,
      "POINTCLOUD",
      ICON_OUTLINER_OB_POINTCLOUD,
-     "Pointcloud",
-     "Pointcloud from Mesh objects"},
+     "Point Cloud",
+     "Point Cloud from Mesh objects"},
 #endif
     {0, NULL, 0, NULL, NULL},
 };
diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
index 108eca209b9..0cc447a2fff 100644
--- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c
+++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
@@ -2229,7 +2229,7 @@ void UV_OT_smart_project(wmOperatorType *ot)
                 0.0f,
                 1.0f,
                 "Area Weight",
-                "Weight projections vector by faces with larger areas",
+                "Weight projection's vector by faces with larger areas",
                 0.0f,
                 1.0f);
 
diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c
index 7c67bfc360b..5e3c234708a 100644
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@ -77,7 +77,7 @@ const EnumPropertyItem rna_enum_id_type_items[] = {
     {ID_TXT, "TEXT", ICON_TEXT, "Text", ""},
     {ID_TE, "TEXTURE", ICON_TEXTURE_DATA, "Texture", ""},
     {ID_HA, "HAIR", ICON_HAIR_DATA, "Hair", ""},
-    {ID_PT, "POINTCLOUD", ICON_POINTCLOUD_DATA, "PointCloud", ""},
+    {ID_PT, "POINTCLOUD", ICON_POINTCLOUD_DATA, "Point Cloud", ""},
     {ID_VO, "VOLUME", ICON_VOLUME_DATA, "Volume", ""},
     {ID_WM, "WINDOWMANAGER", ICON_WINDOW, "Window Manager", ""},
     {ID_WO, "WORLD", ICON_WORLD_DATA, "World", ""},
diff --git a/source/blender/makesrna/intern/rna_pointcloud.c b/source/blender/makesrna/intern/rna_pointcloud.c
index 90ff69b2a8a..2b9465bb549 100644
--- a/source/blender/makesrna/intern/rna_pointcloud.c
+++ b/source/blender/makesrna/intern/rna_pointcloud.c
@@ -135,7 +135,7 @@ static void rna_def_pointcloud(BlenderRNA *brna)
   PropertyRNA *prop;
 
   srna = RNA_def_struct(brna, "PointCloud", "ID");
-  RNA_def_struct_ui_text(srna, "PointCloud", "Point cloud data-block");
+  RNA_def_struct_ui_text(srna, "Point Cloud", "Point cloud data-block");
   RNA_def_struct_ui_icon(srna, ICON_POINTCLOUD_DATA);
 
   /* geometry */



More information about the Bf-blender-cvs mailing list