[Bf-blender-cvs] [4f247dba5ea] master: UI: Cleanup and fix labels and descriptions in various places
Yevgeny Makarov
noreply at git.blender.org
Wed Feb 24 20:25:56 CET 2021
Commit: 4f247dba5ea99d9c3a3544c9dd302192cc1dab75
Author: Yevgeny Makarov
Date: Wed Feb 24 13:25:44 2021 -0600
Branches: master
https://developer.blender.org/rB4f247dba5ea99d9c3a3544c9dd302192cc1dab75
UI: Cleanup and fix labels and descriptions in various places
Changes include using proper and consistent grammar, simplifying
phrasing, using correct terminology, and not including python API
identifiers in tooltips.
Differential Revision: https://developer.blender.org/D9924
===================================================================
M release/scripts/startup/bl_operators/object_align.py
M release/scripts/startup/bl_operators/uvcalc_lightmap.py
M source/blender/editors/animation/anim_channels_edit.c
M source/blender/editors/mesh/editmesh_tools.c
M source/blender/editors/object/object_data_transfer.c
M source/blender/editors/object/object_select.c
M source/blender/editors/space_node/node_select.c
M source/blender/editors/space_sequencer/sequencer_add.c
M source/blender/editors/space_view3d/view3d_edit.c
M source/blender/makesrna/intern/rna_fcurve.c
M source/blender/makesrna/intern/rna_mesh.c
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/makesrna/intern/rna_particle.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/makesrna/intern/rna_speaker.c
M source/blender/makesrna/intern/rna_userdef.c
M source/blender/windowmanager/intern/wm_files_link.c
M source/blender/windowmanager/intern/wm_operators.c
===================================================================
diff --git a/release/scripts/startup/bl_operators/object_align.py b/release/scripts/startup/bl_operators/object_align.py
index cc6724a620e..70b80f7198f 100644
--- a/release/scripts/startup/bl_operators/object_align.py
+++ b/release/scripts/startup/bl_operators/object_align.py
@@ -366,9 +366,9 @@ class AlignObjects(Operator):
bb_quality: BoolProperty(
name="High Quality",
description=(
- "Enables high quality calculation of the "
+ "Enables high quality but slow calculation of the "
"bounding box for perfect results on complex "
- "shape meshes with rotation/scale (Slow)"
+ "shape meshes with rotation/scale"
),
default=True,
)
diff --git a/release/scripts/startup/bl_operators/uvcalc_lightmap.py b/release/scripts/startup/bl_operators/uvcalc_lightmap.py
index 34c36443431..29c17711c2a 100644
--- a/release/scripts/startup/bl_operators/uvcalc_lightmap.py
+++ b/release/scripts/startup/bl_operators/uvcalc_lightmap.py
@@ -614,8 +614,8 @@ class LightMapPack(Operator):
PREF_PACK_IN_ONE: BoolProperty(
name="Share Texture Space",
description=(
- "Objects Share texture space, map all objects "
- "into 1 uvmap"
+ "Objects share texture space, map all objects "
+ "into a single UV map"
),
default=True,
)
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c
index 109cf79c786..38820e05869 100644
--- a/source/blender/editors/animation/anim_channels_edit.c
+++ b/source/blender/editors/animation/anim_channels_edit.c
@@ -2284,7 +2284,7 @@ static void ANIM_OT_channels_expand(wmOperatorType *ot)
/* identifiers */
ot->name = "Expand Channels";
ot->idname = "ANIM_OT_channels_expand";
- ot->description = "Expand (i.e. open) all selected expandable animation channels";
+ ot->description = "Expand (open) all selected expandable animation channels";
/* api callbacks */
ot->exec = animchannels_expand_exec;
@@ -2329,7 +2329,7 @@ static void ANIM_OT_channels_collapse(wmOperatorType *ot)
/* identifiers */
ot->name = "Collapse Channels";
ot->idname = "ANIM_OT_channels_collapse";
- ot->description = "Collapse (i.e. close) all selected expandable animation channels";
+ ot->description = "Collapse (close) all selected expandable animation channels";
/* api callbacks */
ot->exec = animchannels_collapse_exec;
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index 2ea68c3354a..43e0ab97f5d 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -6889,7 +6889,7 @@ void MESH_OT_sort_elements(wmOperatorType *ot)
"MATERIAL",
0,
"Material",
- "Sort selected elements from smallest to greatest material index (faces only!)"},
+ "Sort selected faces from smallest to greatest material index"},
{SRT_SELECTED,
"SELECTED",
0,
diff --git a/source/blender/editors/object/object_data_transfer.c b/source/blender/editors/object/object_data_transfer.c
index b251e617a4c..72ef72403cf 100644
--- a/source/blender/editors/object/object_data_transfer.c
+++ b/source/blender/editors/object/object_data_transfer.c
@@ -615,7 +615,7 @@ void OBJECT_OT_data_transfer(wmOperatorType *ot)
ot->name = "Transfer Mesh Data";
ot->idname = "OBJECT_OT_data_transfer";
ot->description =
- "Transfer data layer(s) (weights, edge sharp, ...) from active to selected meshes";
+ "Transfer data layer(s) (weights, edge sharp, etc.) from active to selected meshes";
/* API callbacks.*/
ot->poll = data_transfer_poll;
diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c
index 1e6a7b9f14e..398ad89a694 100644
--- a/source/blender/editors/object/object_select.c
+++ b/source/blender/editors/object/object_select.c
@@ -1311,7 +1311,7 @@ void OBJECT_OT_select_mirror(wmOperatorType *ot)
/* identifiers */
ot->name = "Select Mirror";
- ot->description = "Select the Mirror objects of the selected object eg. L.sword -> R.sword";
+ ot->description = "Select the mirror objects of the selected object e.g. \"L.sword\" and \"R.sword\"";
ot->idname = "OBJECT_OT_select_mirror";
/* api callbacks */
diff --git a/source/blender/editors/space_node/node_select.c b/source/blender/editors/space_node/node_select.c
index 1e6ca66dd31..58d22c2864f 100644
--- a/source/blender/editors/space_node/node_select.c
+++ b/source/blender/editors/space_node/node_select.c
@@ -729,7 +729,7 @@ void NODE_OT_select_box(wmOperatorType *ot)
"tweak",
0,
"Tweak",
- "Only activate when mouse is not over a node - useful for tweak gesture");
+ "Only activate when mouse is not over a node (useful for tweak gesture)");
WM_operator_properties_gesture_box(ot);
WM_operator_properties_select_operation_simple(ot);
@@ -905,7 +905,7 @@ void NODE_OT_select_lasso(wmOperatorType *ot)
"tweak",
0,
"Tweak",
- "Only activate when mouse is not over a node - useful for tweak gesture");
+ "Only activate when mouse is not over a node (useful for tweak gesture)");
WM_operator_properties_gesture_lasso(ot);
WM_operator_properties_select_operation_simple(ot);
diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c
index e605cf4a889..a9033b98708 100644
--- a/source/blender/editors/space_sequencer/sequencer_add.c
+++ b/source/blender/editors/space_sequencer/sequencer_add.c
@@ -1144,6 +1144,7 @@ void SEQUENCER_OT_effect_strip_add(struct wmOperatorType *ot)
"Type",
"Sequencer effect type");
sequencer_generic_props__internal(ot, SEQPROP_STARTFRAME | SEQPROP_ENDFRAME);
+ /* Only used when strip is of the Color type. */
prop = RNA_def_float_color(ot->srna,
"color",
3,
@@ -1151,7 +1152,7 @@ void SEQUENCER_OT_effect_strip_add(struct wmOperatorType *ot)
0.0f,
1.0f,
"Color",
- "Initialize the strip with this color (only used when type='COLOR')",
+ "Initialize the strip with this color",
0.0f,
1.0f);
RNA_def_property_subtype(prop, PROP_COLOR_GAMMA);
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index 5c2969f47d7..dc590833368 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -5274,7 +5274,7 @@ void VIEW3D_OT_cursor3d(wmOperatorType *ot)
static const EnumPropertyItem prop_shading_type_items[] = {
{OB_WIRE, "WIREFRAME", 0, "Wireframe", "Toggle wireframe shading"},
{OB_SOLID, "SOLID", 0, "Solid", "Toggle solid shading"},
- {OB_MATERIAL, "MATERIAL", 0, "LookDev", "Toggle lookdev shading"},
+ {OB_MATERIAL, "MATERIAL", 0, "Material Preview", "Toggle material preview shading"},
{OB_RENDER, "RENDERED", 0, "Rendered", "Toggle rendered shading"},
{0, NULL, 0, NULL, NULL},
};
diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c
index 989a41b9ad6..1c7f6ef5cb3 100644
--- a/source/blender/makesrna/intern/rna_fcurve.c
+++ b/source/blender/makesrna/intern/rna_fcurve.c
@@ -112,7 +112,7 @@ const EnumPropertyItem rna_enum_beztriple_keyframe_type_items[] = {
"EXTREME",
ICON_KEYTYPE_EXTREME_VEC,
"Extreme",
- "An 'extreme' pose, or some other purpose as needed"},
+ "An \"extreme\" pose, or some other purpose as needed"},
{BEZT_KEYTYPE_JITTER,
"JITTER",
ICON_KEYTYPE_JITTER_VEC,
@@ -128,7 +128,7 @@ const EnumPropertyItem rna_enum_beztriple_interpolation_easing_items[] = {
ICON_IPO_EASE_IN_OUT,
"Automatic Easing",
"Easing type is chosen automatically based on what the type of interpolation used "
- "(e.g. 'Ease In' for transitional types, and 'Ease Out' for dynamic effects)"},
+ "(e.g. Ease In for transitional types, and Ease Out for dynamic effects)"},
{BEZT_IPO_EASE_IN,
"EASE_IN",
diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c
index f51bd2f9678..ed1024116fb 100644
--- a/source/blender/makesrna/intern/rna_mesh.c
+++ b/source/blender/makesrna/intern/rna_mesh.c
@@ -1893,7 +1893,7 @@ static void rna_def_mloop(BlenderRNA *brna)
prop,
"Bitangent",
"Bitangent vector of this vertex for this polygon (must be computed beforehand using "
- "calc_tangents, *use it only if really needed*, slower access than bitangent_sign)");
+ "calc_tangents, use it only if really needed, slower access than bitangent_sign)");
}
static void rna_def_mpolygon(BlenderRNA *brna)
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index ae10b637b30..e2ec90ae9aa 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -180,7 +180,7 @@ const EnumPropertyItem rna_enum_object_modifier_type_items[] = {
"Skin",
"Create a solid shape from vertices and edges, using the vertex radius to define the "
"thickness"},
- {eModifierType_Solidify, "SOLIDIFY", ICON_MOD_SOLIDIFY, "Solidify", " Make the surface thick"},
+ {eModifierType_Solidify, "SOLIDIFY", ICON_MOD_SOLIDIFY, "Solidify", "Make the surface thick"},
{eModifierType_Subsurf,
"SUBSURF",
ICON_MOD_SUBSURF,
@@ -279,7 +279,7 @@ const EnumPropertyItem rna_enum_object_modifier_type_items[] = {
"WAVE",
ICON_MOD_WAVE,
"Wave",
- "Adds a ripple-like motion to an object’s geometry"},
+ "Adds a ripple-like motion to an object's geometry"},
{eModifierType_VolumeDisplace,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list