blender
/
blender
132
398
Fork 577
Code Issues 6.2k Pull Requests 745 Projects 19 Wiki Activity

UI: Cleanup spelling of compound words 

Approximately 138 changes in the spelling of compound words
and proper names like "Light Probe", "Shrink/Fatten", "Face Map".
In many cases, hyphens were used where they aren't correct, like
"re-fit". Other common changes include:
 - "Datablock" -> "data-block"
 - "Floating point" -> "floating-point"
 - "Ngons" -> "n-gons"

These changes help give the language used in the interface
a consistent, more professional feel.

Differential Revision: https://developer.blender.org/D9923
This commit is contained in:
Yevgeny Makarov 2020-12-24 13:11:22 -06:00 committed by Hans Goudey
parent 2917f550ca
commit af316d2761
Notes: blender-bot 2023-02-14 09:37:55 +01:00 
Referenced by issue #84124, Weird cursor offset  with wintab enabled on Wacom Intuos S tablet
Referenced by issue #43180, Values in depth channel saved incorrectly on .blend file re-open
68 changed files with 138 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/presets/keyconfig/blender.py
View File

@ -130,7 +130,7 @@ class Prefs(bpy.types.KeyConfigPreferences):
description=(
"The action when Middle-Mouse dragging in the viewport. "
"Shift-Middle-Mouse is used for the other action. "
"This applies to Track-Pad as well"
"This applies to trackpad as well"
),
update=update_fn,
)

2
release/scripts/startup/bl_operators/anim.py
View File

@ -347,7 +347,7 @@ class ClearUselessActions(Operator):
class UpdateAnimatedTransformConstraint(Operator):
"""Update fcurves/drivers affecting Transform constraints (use it with files from 2.70 and earlier)"""
"""Update f-curves/drivers affecting Transform constraints (use it with files from 2.70 and earlier)"""
bl_idname = "anim.update_animated_transform_constraints"
bl_label = "Update Animated Transform Constraints"
bl_options = {'REGISTER', 'UNDO'}

2
release/scripts/startup/bl_operators/sequencer.py
View File

@ -80,7 +80,7 @@ class SequencerCrossfadeSounds(Operator):
class SequencerSplitMulticam(Operator):
"""Split multi-cam strip and select camera"""
"""Split multicam strip and select camera"""
bl_idname = "sequencer.split_multicam"
bl_label = "Split Multicam"

2
release/scripts/startup/bl_operators/userpref.py
View File

@ -868,7 +868,7 @@ class PREFERENCES_OT_addon_show(Operator):
# Note: shares some logic with PREFERENCES_OT_addon_install
# but not enough to de-duplicate. Fixes here may apply to both.
class PREFERENCES_OT_app_template_install(Operator):
"""Install an application-template"""
"""Install an application template"""
bl_idname = "preferences.app_template_install"
bl_label = "Install Template from File..."

2
release/scripts/startup/bl_operators/uvcalc_lightmap.py
View File

@ -642,7 +642,7 @@ class LightMapPack(Operator):
# UV Packing...
PREF_BOX_DIV: IntProperty(
name="Pack Quality",
description="Pre Packing before the complex boxpack",
description="Pre-packing before the complex boxpack",
min=1, max=48,
default=12,
)

8
release/scripts/startup/bl_operators/wm.py
View File

@ -834,7 +834,7 @@ class WM_OT_context_modal_mouse(Operator):
class WM_OT_url_open(Operator):
"""Open a website in the web-browser"""
"""Open a website in the web browser"""
bl_idname = "wm.url_open"
bl_label = ""
bl_options = {'INTERNAL'}
@ -851,7 +851,7 @@ class WM_OT_url_open(Operator):
class WM_OT_url_open_preset(Operator):
"""Open a preset website in the web-browser"""
"""Open a preset website in the web browser"""
bl_idname = "wm.url_open_preset"
bl_label = "Open Preset Website"
bl_options = {'INTERNAL'}
@ -1737,7 +1737,7 @@ class WM_OT_tool_set_by_index(Operator):
)
expand: BoolProperty(
description="Include tool sub-groups",
description="Include tool subgroups",
default=True,
)
@ -2169,7 +2169,7 @@ class WM_OT_batch_rename(Operator):
'GPENCIL': ("grease_pencils", "Grease Pencil(s)"),
'CAMERA': ("cameras", "Camera(s)"),
'SPEAKER': ("speakers", "Speaker(s)"),
'LIGHT_PROBE': ("light_probes", "LightProbe(s)"),
'LIGHT_PROBE': ("light_probes", "Light Probe(s)"),
}
# Finish with space types.

2
release/scripts/startup/bl_ui/space_userpref.py
View File

@ -1437,7 +1437,7 @@ class USERPREF_PT_saveload_file_browser(SaveLoadPanel, CenterAlignMixIn, Panel):
col.prop(paths, "use_filter_files")
col = layout.column(heading="Hide")
col.prop(paths, "show_hidden_files_datablocks", text="Dot File & Datablocks")
col.prop(paths, "show_hidden_files_datablocks", text="Dot File & Data-Blocks")
col.prop(paths, "hide_recent_locations", text="Recent Locations")
col.prop(paths, "hide_system_bookmarks", text="System Bookmarks")

8
release/scripts/startup/bl_ui/space_view3d.py
View File

@ -957,7 +957,7 @@ class VIEW3D_MT_transform(VIEW3D_MT_transform_base, Menu):
# generic...
layout = self.layout
if context.mode == 'EDIT_MESH':
layout.operator("transform.shrink_fatten", text="Shrink Fatten")
layout.operator("transform.shrink_fatten", text="Shrink/Fatten")
layout.operator("transform.skin_resize")
elif context.mode == 'EDIT_CURVE':
layout.operator("transform.transform", text="Radius").mode = 'CURVE_SHRINKFATTEN'
@ -5091,7 +5091,7 @@ class VIEW3D_MT_edit_gpencil_transform(Menu):
layout.operator("transform.bend", text="Bend")
layout.operator("transform.shear", text="Shear")
layout.operator("transform.tosphere", text="To Sphere")
layout.operator("transform.transform", text="Shrink Fatten").mode = 'GPENCIL_SHRINKFATTEN'
layout.operator("transform.transform", text="Shrink/Fatten").mode = 'GPENCIL_SHRINKFATTEN'
class VIEW3D_MT_edit_gpencil_showhide(Menu):
@ -7044,7 +7044,7 @@ class VIEW3D_MT_gpencil_edit_context_menu(Menu):
col.operator("transform.bend", text="Bend")
col.operator("transform.shear", text="Shear")
col.operator("transform.tosphere", text="To Sphere")
col.operator("transform.transform", text="Shrink Fatten").mode = 'GPENCIL_SHRINKFATTEN'
col.operator("transform.transform", text="Shrink/Fatten").mode = 'GPENCIL_SHRINKFATTEN'
col.separator()
@ -7088,7 +7088,7 @@ class VIEW3D_MT_gpencil_edit_context_menu(Menu):
col.separator()
col.operator("gpencil.stroke_smooth", text="Smooth Stroke").only_selected = False
col.operator("transform.transform", text="Shrink Fatten").mode = 'GPENCIL_SHRINKFATTEN'
col.operator("transform.transform", text="Shrink/Fatten").mode = 'GPENCIL_SHRINKFATTEN'
col.separator()

2
source/blender/editors/animation/anim_channels_edit.c
View File

@ -3422,7 +3422,7 @@ static void ANIM_OT_channels_click(wmOperatorType *ot)
/* identifiers */
ot->name = "Mouse Click on Channels";
ot->idname = "ANIM_OT_channels_click";
ot->description = "Handle mouse-clicks over animation channels";
ot->description = "Handle mouse clicks over animation channels";
/* api callbacks */
ot->invoke = animchannels_mouseclick_invoke;

2
source/blender/editors/armature/armature_add.c
View File

@ -1617,7 +1617,7 @@ void ARMATURE_OT_bone_primitive_add(wmOperatorType *ot)
/* identifiers */
ot->name = "Add Bone";
ot->idname = "ARMATURE_OT_bone_primitive_add";
ot->description = "Add a new bone located at the 3D-Cursor";
ot->description = "Add a new bone located at the 3D cursor";
/* api callbacks */
ot->exec = armature_bone_primitive_add_exec;

2
source/blender/editors/armature/armature_edit.c
View File

@ -876,7 +876,7 @@ void ARMATURE_OT_fill(wmOperatorType *ot)
/* identifiers */
ot->name = "Fill Between Joints";
ot->idname = "ARMATURE_OT_fill";
ot->description = "Add bone between selected joint(s) and/or 3D-Cursor";
ot->description = "Add bone between selected joint(s) and/or 3D cursor";
/* callbacks */
ot->exec = armature_fill_bones_exec;

4
source/blender/editors/armature/armature_relations.c
View File

@ -948,7 +948,7 @@ void ARMATURE_OT_parent_set(wmOperatorType *ot)
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
RNA_def_enum(
ot->srna, "type", prop_editarm_make_parent_types, 0, "ParentType", "Type of parenting");
ot->srna, "type", prop_editarm_make_parent_types, 0, "Parent Type", "Type of parenting");
}
static const EnumPropertyItem prop_editarm_clear_parent_types[] = {
@ -1029,7 +1029,7 @@ void ARMATURE_OT_parent_clear(wmOperatorType *ot)
"type",
prop_editarm_clear_parent_types,
0,
"ClearType",
"Clear Type",
"What way to clear parenting");
}

6
source/blender/editors/curve/editfont.c
View File

@ -1802,7 +1802,7 @@ static int textbox_add_exec(bContext *C, wmOperator *UNUSED(op))
void FONT_OT_textbox_add(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Add Textbox";
ot->name = "Add Text Box";
ot->description = "Add a new text box";
ot->idname = "FONT_OT_textbox_add";
@ -1846,8 +1846,8 @@ static int textbox_remove_exec(bContext *C, wmOperator *op)
void FONT_OT_textbox_remove(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Remove Textbox";
ot->description = "Remove the textbox";
ot->name = "Remove Text Box";
ot->description = "Remove the text box";
ot->idname = "FONT_OT_textbox_remove";
/* api callbacks */

2
source/blender/editors/io/io_alembic.c
View File

@ -428,7 +428,7 @@ void WM_OT_alembic_export(wmOperatorType *ot)
"triangulate",
false,
"Triangulate",
"Export Polygons (Quads & NGons) as Triangles");
"Export polygons (quads and n-gons) as triangles");
RNA_def_enum(ot->srna,
"quad_method",

2
source/blender/editors/io/io_collada.c
View File

@ -649,7 +649,7 @@ void WM_OT_collada_export(wmOperatorType *ot)
"Copy textures to same folder where the .dae file is exported");
RNA_def_boolean(
func, "triangulate", 1, "Triangulate", "Export Polygons (Quads & NGons) as Triangles");
func, "triangulate", 1, "Triangulate", "Export polygons (quads and n-gons) as triangles");
RNA_def_boolean(func,
"use_object_instantiation",

2
source/blender/editors/mesh/editmesh_add.c
View File

@ -239,7 +239,7 @@ void MESH_OT_primitive_cube_add(wmOperatorType *ot)
static const EnumPropertyItem fill_type_items[] = {
{0, "NOTHING", 0, "Nothing", "Don't fill at all"},
{1, "NGON", 0, "Ngon", "Use ngons"},
{1, "NGON", 0, "N-Gon", "Use n-gons"},
{2, "TRIFAN", 0, "Triangle Fan", "Use triangle fans"},
{0, NULL, 0, NULL, NULL},
};

2
source/blender/editors/mesh/editmesh_bevel.c
View File

@ -1055,7 +1055,7 @@ void MESH_OT_bevel(wmOperatorType *ot)
"CUTOFF",
0,
"Cutoff",
"A cut-off at each profile's end before the intersection"},
"A cutoff at each profile's end before the intersection"},
{0, NULL, 0, NULL, NULL},
};

4
source/blender/editors/mesh/editmesh_select.c
View File

@ -4327,7 +4327,7 @@ void MESH_OT_edges_select_sharp(wmOperatorType *ot)
/* identifiers */
ot->name = "Select Sharp Edges";
ot->description = "Select all sharp-enough edges";
ot->description = "Select all sharp enough edges";
ot->idname = "MESH_OT_edges_select_sharp";
/* api callbacks */
@ -4536,7 +4536,7 @@ static int edbm_select_non_manifold_exec(bContext *C, wmOperator *op)
void MESH_OT_select_non_manifold(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Select Non Manifold";
ot->name = "Select Non-Manifold";
ot->description = "Select all non-manifold vertices or edges";
ot->idname = "MESH_OT_select_non_manifold";

2
source/blender/editors/mesh/editmesh_select_similar.c
View File

@ -86,7 +86,7 @@ static const EnumPropertyItem prop_similar_types[] = {
{SIMFACE_NORMAL, "NORMAL", 0, "Normal", ""},
{SIMFACE_COPLANAR, "COPLANAR", 0, "Coplanar", ""},
{SIMFACE_SMOOTH, "SMOOTH", 0, "Flat/Smooth", ""},
{SIMFACE_FACEMAP, "FACE_MAP", 0, "Face-Map", ""},
{SIMFACE_FACEMAP, "FACE_MAP", 0, "Face Map", ""},
#ifdef WITH_FREESTYLE
{SIMFACE_FREESTYLE, "FREESTYLE_FACE", 0, "Freestyle Face Marks", ""},
#endif

10
source/blender/editors/mesh/editmesh_tools.c
View File

@ -187,7 +187,7 @@ void MESH_OT_subdivide(wmOperatorType *ot)
prop_mesh_cornervert_types,
SUBD_CORNER_STRAIGHT_CUT,
"Quad Corner Type",
"How to subdivide quad corners (anything other than Straight Cut will prevent ngons)");
"How to subdivide quad corners (anything other than Straight Cut will prevent n-gons)");
RNA_def_float(ot->srna,
"fractal",
@ -335,7 +335,7 @@ void MESH_OT_subdivide_edgering(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Subdivide Edge-Ring";
ot->description = "Subdivide perpendicular edges to the selected edge ring";
ot->description = "Subdivide perpendicular edges to the selected edge-ring";
ot->idname = "MESH_OT_subdivide_edgering";
/* api callbacks */
@ -407,7 +407,7 @@ void MESH_OT_unsubdivide(wmOperatorType *ot)
/* props */
RNA_def_int(
ot->srna, "iterations", 2, 1, 1000, "Iterations", "Number of times to unsubdivide", 1, 100);
ot->srna, "iterations", 2, 1, 1000, "Iterations", "Number of times to un-subdivide", 1, 100);
}
/** \} */
@ -6939,7 +6939,7 @@ void MESH_OT_sort_elements(wmOperatorType *ot)
type_items,
SRT_VIEW_ZAXIS,
"Type",
"Type of re-ordering operation to apply");
"Type of reordering operation to apply");
RNA_def_enum_flag(ot->srna,
"elements",
elem_items,
@ -7258,7 +7258,7 @@ void MESH_OT_wireframe(wmOperatorType *ot)
/* identifiers */
ot->name = "Wireframe";
ot->idname = "MESH_OT_wireframe";
ot->description = "Create a solid wire-frame from faces";
ot->description = "Create a solid wireframe from faces";
/* api callbacks */
ot->exec = edbm_wireframe_exec;

2
source/blender/editors/mesh/mesh_data.c
View File

@ -843,7 +843,7 @@ void MESH_OT_customdata_mask_clear(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Clear Sculpt-Mask Data";
ot->name = "Clear Sculpt Mask Data";
ot->idname = "MESH_OT_customdata_mask_clear";
ot->description = "Clear vertex sculpt masking data from the mesh";

2
source/blender/editors/object/object_add.c
View File

@ -324,7 +324,7 @@ void ED_object_add_generic_props(wmOperatorType *ot, bool do_editmode)
if (do_editmode) {
prop = RNA_def_boolean(
ot->srna, "enter_editmode", 0, "Enter Editmode", "Enter editmode when adding this object");
ot->srna, "enter_editmode", 0, "Enter Edit Mode", "Enter edit mode when adding this object");
RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
}
/* note: this property gets hidden for add-camera operator */

8
source/blender/editors/object/object_constraint.c
View File

@ -1008,7 +1008,7 @@ void CONSTRAINT_OT_childof_set_inverse(wmOperatorType *ot)
/* identifiers */
ot->name = "Set Inverse";
ot->idname = "CONSTRAINT_OT_childof_set_inverse";
ot->description = "Set inverse correction for ChildOf constraint";
ot->description = "Set inverse correction for Child Of constraint";
/* callbacks */
ot->invoke = childof_set_inverse_invoke;
@ -1057,7 +1057,7 @@ void CONSTRAINT_OT_childof_clear_inverse(wmOperatorType *ot)
/* identifiers */
ot->name = "Clear Inverse";
ot->idname = "CONSTRAINT_OT_childof_clear_inverse";
ot->description = "Clear inverse correction for ChildOf constraint";
ot->description = "Clear inverse correction for Child Of constraint";
/* callbacks */
ot->invoke = childof_clear_inverse_invoke;
@ -1263,7 +1263,7 @@ void CONSTRAINT_OT_objectsolver_set_inverse(wmOperatorType *ot)
/* identifiers */
ot->name = "Set Inverse";
ot->idname = "CONSTRAINT_OT_objectsolver_set_inverse";
ot->description = "Set inverse correction for ObjectSolver constraint";
ot->description = "Set inverse correction for Object Solver constraint";
/* callbacks */
ot->invoke = objectsolver_set_inverse_invoke;
@ -1319,7 +1319,7 @@ void CONSTRAINT_OT_objectsolver_clear_inverse(wmOperatorType *ot)
/* identifiers */
ot->name = "Clear Inverse";
ot->idname = "CONSTRAINT_OT_objectsolver_clear_inverse";
ot->description = "Clear inverse correction for ObjectSolver constraint";
ot->description = "Clear inverse correction for Object Solver constraint";
/* callbacks */
ot->invoke = objectsolver_clear_inverse_invoke;

4
source/blender/editors/object/object_edit.c
View File

@ -863,8 +863,8 @@ void OBJECT_OT_editmode_toggle(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Toggle Editmode";
ot->description = "Toggle object's editmode";
ot->name = "Toggle Edit Mode";
ot->description = "Toggle object's edit mode";
ot->idname = "OBJECT_OT_editmode_toggle";
/* api callbacks */

2
source/blender/editors/object/object_transform.c
View File

@ -1533,7 +1533,7 @@ void OBJECT_OT_origin_set(wmOperatorType *ot)
0,
"Origin to Geometry",
"Calculate the center of geometry based on the current pivot point (median, otherwise "
"bounding-box)"},
"bounding box)"},
{ORIGIN_TO_CURSOR,
"ORIGIN_CURSOR",
0,

4
source/blender/editors/render/render_shading.c
View File

@ -1345,13 +1345,13 @@ void SCENE_OT_light_cache_bake(wmOperatorType *ot)
{LIGHTCACHE_SUBSET_ALL,
"ALL",
0,
"All LightProbes",
"All Light Probes",
"Bake both irradiance grids and reflection cubemaps"},
{LIGHTCACHE_SUBSET_DIRTY,
"DIRTY",
0,
"Dirty Only",
"Only bake lightprobes that are marked as dirty"},
"Only bake light probes that are marked as dirty"},
{LIGHTCACHE_SUBSET_CUBE,
"CUBEMAPS",
0,

4
source/blender/editors/screen/screen_ops.c
View File

@ -3611,7 +3611,7 @@ static int spacedata_cleanup_exec(bContext *C, wmOperator *op)
static void SCREEN_OT_spacedata_cleanup(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Clean-up Space-data";
ot->name = "Cleanup Space Data";
ot->description = "Remove unused settings for invisible editors";
ot->idname = "SCREEN_OT_spacedata_cleanup";
@ -5285,7 +5285,7 @@ static void SCREEN_OT_space_type_set_or_cycle(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Cycle Space Type Set";
ot->description = "Set the space type or cycle sub-type";
ot->description = "Set the space type or cycle subtype";
ot->idname = "SCREEN_OT_space_type_set_or_cycle";
/* api callbacks */

2
source/blender/editors/sculpt_paint/paint_image_proj.c
View File

@ -6299,7 +6299,7 @@ void PAINT_OT_image_from_view(wmOperatorType *ot)
/* identifiers */
ot->name = "Image from View";
ot->idname = "PAINT_OT_image_from_view";
ot->description = "Make an image from biggest 3D view for re-projection";
ot->description = "Make an image from biggest 3D view for reprojection";
/* api callbacks */
ot->exec = texture_paint_image_from_view_exec;

2
source/blender/editors/sculpt_paint/sculpt_cloth.c
View File

@ -1351,7 +1351,7 @@ static EnumPropertyItem prop_cloth_filter_type[] = {
"SCALE",
0,
"Scale",
"Scales the mesh as a soft-body using the origin of the object as scale"},
"Scales the mesh as a soft body using the origin of the object as scale"},
{0, NULL, 0, NULL, NULL},
};

2
source/blender/editors/space_action/action_edit.c
View File

@ -1702,7 +1702,7 @@ static const EnumPropertyItem prop_actkeys_snap_types[] = {
"NEAREST_FRAME",
0,
"Selection to Nearest Frame",
"Snap selected keyframes to the nearest (whole) frame (use to fix accidental sub-frame "
"Snap selected keyframes to the nearest (whole) frame (use to fix accidental subframe "
"offsets)"},
{ACTKEYS_SNAP_NEAREST_SECOND,
"NEAREST_SECOND",

2
source/blender/editors/space_clip/clip_ops.c
View File

@ -533,7 +533,7 @@ void CLIP_OT_view_pan(wmOperatorType *ot)
-FLT_MAX,
FLT_MAX,
"Offset",
"Offset in floating point units, 1.0 is the width and height of the image",
"Offset in floating-point units, 1.0 is the width and height of the image",
-FLT_MAX,
FLT_MAX);
}

4
source/blender/editors/space_clip/tracking_ops.c
View File

@ -1003,7 +1003,7 @@ void CLIP_OT_slide_marker(wmOperatorType *ot)
-FLT_MAX,
FLT_MAX,
"Offset",
"Offset in floating point units, 1.0 is the width and height of the image",
"Offset in floating-point units, 1.0 is the width and height of the image",
-FLT_MAX,
FLT_MAX);
}
@ -1881,7 +1881,7 @@ void CLIP_OT_clean_tracks(wmOperatorType *ot)
0.0f,
FLT_MAX,
"Reprojection Error",
"Effect on tracks which have got larger re-projection error",
"Effect on tracks which have got larger reprojection error",
0.0f,
100.0f);
RNA_def_enum(ot->srna, "action", actions_items, 0, "Action", "Cleanup action to execute");

2
source/blender/editors/space_file/file_ops.c
View File

@ -1777,7 +1777,7 @@ static int file_refresh_exec(bContext *C, wmOperator *UNUSED(unused))
void FILE_OT_refresh(struct wmOperatorType *ot)
{
/* identifiers */
ot->name = "Refresh Filelist";
ot->name = "Refresh File List";
ot->description = "Refresh the file list";
ot->idname = "FILE_OT_refresh";

2
source/blender/editors/space_graph/graph_edit.c
View File

@ -2198,7 +2198,7 @@ static const EnumPropertyItem prop_graphkeys_snap_types[] = {
"NEAREST_FRAME",
0,
"Selection to Nearest Frame",
"Snap selected keyframes to the nearest (whole) frame (use to fix accidental sub-frame "
"Snap selected keyframes to the nearest (whole) frame (use to fix accidental subframe "
"offsets)"},
{GRAPHKEYS_SNAP_NEAREST_SECOND,
"NEAREST_SECOND",

2
source/blender/editors/space_image/image_ops.c
View File

@ -417,7 +417,7 @@ void IMAGE_OT_view_pan(wmOperatorType *ot)
-FLT_MAX,
FLT_MAX,
"Offset",
"Offset in floating point units, 1.0 is the width and height of the image",
"Offset in floating-point units, 1.0 is the width and height of the image",
-FLT_MAX,
FLT_MAX);
}

2
source/blender/editors/space_nla/nla_channels.c
View File

@ -621,7 +621,7 @@ void NLA_OT_action_unlink(wmOperatorType *ot)
"force_delete",
false,
"Force Delete",
"Clear Fake User and remove copy stashed in this datablock's NLA stack");
"Clear Fake User and remove copy stashed in this data-block's NLA stack");
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
}

2
source/blender/editors/space_node/node_edit.c
View File

@ -1859,7 +1859,7 @@ void NODE_OT_output_file_add_socket(wmOperatorType *ot)
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
RNA_def_string(
ot->srna, "file_path", "Image", MAX_NAME, "File Path", "Sub-path of the output file");
ot->srna, "file_path", "Image", MAX_NAME, "File Path", "Subpath of the output file");
}
/* ****************** Multi File Output Remove Socket ******************* */

2
source/blender/editors/space_sequencer/sequencer_view.c
View File

@ -393,7 +393,7 @@ void SEQUENCER_OT_view_ghost_border(wmOperatorType *ot)
/* Identifiers. */
ot->name = "Border Offset View";
ot->idname = "SEQUENCER_OT_view_ghost_border";
ot->description = "Set the boundaries of the border used for offset-view";
ot->description = "Set the boundaries of the border used for offset view";
/* Api callbacks. */
ot->invoke = WM_gesture_box_invoke;

4
source/blender/editors/space_view3d/view3d_select.c
View File

@ -2535,12 +2535,12 @@ void VIEW3D_OT_select(wmOperatorType *ot)
"center",
0,
"Center",
"Use the object center when selecting, in edit-mode used to extend object selection");
"Use the object center when selecting, in edit mode used to extend object selection");
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
prop = RNA_def_boolean(
ot->srna, "enumerate", 0, "Enumerate", "List objects under the mouse (object mode only)");
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
prop = RNA_def_boolean(ot->srna, "object", 0, "Object", "Use object selection (edit-mode only)");
prop = RNA_def_boolean(ot->srna, "object", 0, "Object", "Use object selection (edit mode only)");
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
prop = RNA_def_int_vector(ot->srna,

18
source/blender/editors/transform/transform_ops.c
View File

@ -131,32 +131,32 @@ const EnumPropertyItem rna_enum_transform_mode_types[] = {
{TFM_ROTATION, "ROTATION", 0, "Rotation", ""},
{TFM_RESIZE, "RESIZE", 0, "Resize", ""},
{TFM_SKIN_RESIZE, "SKIN_RESIZE", 0, "Skin Resize", ""},
{TFM_TOSPHERE, "TOSPHERE", 0, "Tosphere", ""},
{TFM_TOSPHERE, "TOSPHERE", 0, "To Sphere", ""},
{TFM_SHEAR, "SHEAR", 0, "Shear", ""},
{TFM_BEND, "BEND", 0, "Bend", ""},
{TFM_SHRINKFATTEN, "SHRINKFATTEN", 0, "Shrinkfatten", ""},
{TFM_SHRINKFATTEN, "SHRINKFATTEN", 0, "Shrink/Fatten", ""},
{TFM_TILT, "TILT", 0, "Tilt", ""},
{TFM_TRACKBALL, "TRACKBALL", 0, "Trackball", ""},
{TFM_PUSHPULL, "PUSHPULL", 0, "Pushpull", ""},
{TFM_PUSHPULL, "PUSHPULL", 0, "Push/Pull", ""},
{TFM_CREASE, "CREASE", 0, "Crease", ""},
{TFM_MIRROR, "MIRROR", 0, "Mirror", ""},
{TFM_BONESIZE, "BONE_SIZE", 0, "Bonesize", ""},
{TFM_BONESIZE, "BONE_SIZE", 0, "Bone Size", ""},
{TFM_BONE_ENVELOPE, "BONE_ENVELOPE", 0, "Bone Envelope", ""},
{TFM_BONE_ENVELOPE_DIST, "BONE_ENVELOPE_DIST", 0, "Bone Envelope Distance", ""},
{TFM_CURVE_SHRINKFATTEN, "CURVE_SHRINKFATTEN", 0, "Curve Shrinkfatten", ""},
{TFM_MASK_SHRINKFATTEN, "MASK_SHRINKFATTEN", 0, "Mask Shrinkfatten", ""},
{TFM_GPENCIL_SHRINKFATTEN, "GPENCIL_SHRINKFATTEN", 0, "GPencil Shrinkfatten", ""},
{TFM_CURVE_SHRINKFATTEN, "CURVE_SHRINKFATTEN", 0, "Curve Shrink/Fatten", ""},
{TFM_MASK_SHRINKFATTEN, "MASK_SHRINKFATTEN", 0, "Mask Shrink/Fatten", ""},
{TFM_GPENCIL_SHRINKFATTEN, "GPENCIL_SHRINKFATTEN", 0, "Grease Pencil Shrink/Fatten", ""},
{TFM_BONE_ROLL, "BONE_ROLL", 0, "Bone Roll", ""},
{TFM_TIME_TRANSLATE, "TIME_TRANSLATE", 0, "Time Translate", ""},
{TFM_TIME_SLIDE, "TIME_SLIDE", 0, "Time Slide", ""},
{TFM_TIME_SCALE, "TIME_SCALE", 0, "Time Scale", ""},
{TFM_TIME_EXTEND, "TIME_EXTEND", 0, "Time Extend", ""},
{TFM_BAKE_TIME, "BAKE_TIME", 0, "Bake Time", ""},
{TFM_BWEIGHT, "BWEIGHT", 0, "Bweight", ""},
{TFM_BWEIGHT, "BWEIGHT", 0, "Bevel Weight", ""},
{TFM_ALIGN, "ALIGN", 0, "Align", ""},
{TFM_EDGE_SLIDE, "EDGESLIDE", 0, "Edge Slide", ""},
{TFM_SEQ_SLIDE, "SEQSLIDE", 0, "Sequence Slide", ""},
{TFM_GPENCIL_OPACITY, "GPENCIL_OPACITY", 0, "GPencil Opacity", ""},
{TFM_GPENCIL_OPACITY, "GPENCIL_OPACITY", 0, "Grease Pencil Opacity", ""},
{0, NULL, 0, NULL, NULL},
};

2
source/blender/makesrna/intern/rna_action.c
View File

@ -336,7 +336,7 @@ static void rna_def_dopesheet(BlenderRNA *brna)
RNA_def_property_boolean_sdna(prop, NULL, "flag", ADS_FLAG_SHOW_DBFILTERS);
RNA_def_property_ui_text(
prop,
"Show Datablock Filters",
"Show Data-Block Filters",
"Show options for whether channels related to certain types of data are included");
RNA_def_property_ui_icon(prop, ICON_DISCLOSURE_TRI_RIGHT, 1);
RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN, NULL);

4
source/blender/makesrna/intern/rna_armature.c
View File

@ -1250,7 +1250,7 @@ static void rna_def_edit_bone(BlenderRNA *brna)
srna = RNA_def_struct(brna, "EditBone", NULL);
RNA_def_struct_sdna(srna, "EditBone");
RNA_def_struct_idprops_func(srna, "rna_EditBone_idprops");
RNA_def_struct_ui_text(srna, "Edit Bone", "Editmode bone in an Armature data-block");
RNA_def_struct_ui_text(srna, "Edit Bone", "Edit mode bone in an armature data-block");
RNA_def_struct_ui_icon(srna, ICON_BONE_DATA);
RNA_define_verify_sdna(0); /* not in sdna */
@ -1335,7 +1335,7 @@ static void rna_def_edit_bone(BlenderRNA *brna)
RNA_def_property_flag(prop, PROP_THICK_WRAP); /* no reference to original data */
RNA_def_property_ui_text(
prop,
"Editbone Matrix",
"Edit Bone Matrix",
"Matrix combining location and rotation of the bone (head position, direction and roll), "
"in armature space (does not include/support bone's length/size)");
RNA_def_property_float_funcs(prop, "rna_EditBone_matrix_get", "rna_EditBone_matrix_set", NULL);

8
source/blender/makesrna/intern/rna_attribute.c
View File

@ -364,7 +364,7 @@ static void rna_def_attribute_float(BlenderRNA *brna)
srna = RNA_def_struct(brna, "FloatAttribute", "Attribute");
RNA_def_struct_sdna(srna, "CustomDataLayer");
RNA_def_struct_ui_text(srna, "Float Attribute", "Geometry attribute with floating point values");
RNA_def_struct_ui_text(srna, "Float Attribute", "Geometry attribute with floating-point values");
prop = RNA_def_property(srna, "data", PROP_COLLECTION, PROP_NONE);
RNA_def_property_struct_type(prop, "FloatAttributeValue");
@ -381,7 +381,7 @@ static void rna_def_attribute_float(BlenderRNA *brna)
srna = RNA_def_struct(brna, "FloatAttributeValue", NULL);
RNA_def_struct_sdna(srna, "MFloatProperty");
RNA_def_struct_ui_text(
srna, "Float Attribute Value", "Floating point value in geometry attribute");
srna, "Float Attribute Value", "Floating-point value in geometry attribute");
prop = RNA_def_property(srna, "value", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "f");
RNA_def_property_update(prop, 0, "rna_Attribute_update_data");
@ -396,7 +396,7 @@ static void rna_def_attribute_float_vector(BlenderRNA *brna)
srna = RNA_def_struct(brna, "FloatVectorAttribute", "Attribute");
RNA_def_struct_sdna(srna, "CustomDataLayer");
RNA_def_struct_ui_text(
srna, "Float Vector Attribute", "Vector geometry attribute, with floating point precision");
srna, "Float Vector Attribute", "Vector geometry attribute, with floating-point precision");
prop = RNA_def_property(srna, "data", PROP_COLLECTION, PROP_NONE);
RNA_def_property_struct_type(prop, "FloatVectorAttributeValue");
@ -432,7 +432,7 @@ static void rna_def_attribute_float_color(BlenderRNA *brna)
srna = RNA_def_struct(brna, "FloatColorAttribute", "Attribute");
RNA_def_struct_sdna(srna, "CustomDataLayer");
RNA_def_struct_ui_text(
srna, "Float Color Attribute", "Color geometry attribute, with floating point precision");
srna, "Float Color Attribute", "Color geometry attribute, with floating-point precision");
prop = RNA_def_property(srna, "data", PROP_COLLECTION, PROP_NONE);
RNA_def_property_struct_type(prop, "FloatColorAttributeValue");

2
source/blender/makesrna/intern/rna_brush.c
View File

@ -2831,7 +2831,7 @@ static void rna_def_brush(BlenderRNA *brna)
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.001, 3);
RNA_def_property_ui_text(
prop, "Autosmooth", "Amount of smoothing to automatically apply to each stroke");
prop, "Auto-Smooth", "Amount of smoothing to automatically apply to each stroke");
RNA_def_property_update(prop, 0, "rna_Brush_update");
prop = RNA_def_property(srna, "topology_rake_factor", PROP_FLOAT, PROP_FACTOR);

6
source/blender/makesrna/intern/rna_depsgraph.c
View File

@ -604,7 +604,7 @@ static void rna_def_depsgraph_update(BlenderRNA *brna)
prop = RNA_def_property(srna, "id", PROP_POINTER, PROP_NONE);
RNA_def_property_struct_type(prop, "ID");
RNA_def_property_ui_text(prop, "ID", "Updated datablock");
RNA_def_property_ui_text(prop, "ID", "Updated data-block");
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE | PROP_EDITABLE);
RNA_def_property_pointer_funcs(prop, "rna_DepsgraphUpdate_id_get", NULL, NULL, NULL);
@ -745,7 +745,7 @@ static void rna_def_depsgraph(BlenderRNA *brna)
NULL,
NULL,
NULL);
RNA_def_property_ui_text(prop, "IDs", "All evaluated datablocks");
RNA_def_property_ui_text(prop, "IDs", "All evaluated data-blocks");
prop = RNA_def_property(srna, "objects", PROP_COLLECTION, PROP_NONE);
RNA_def_property_struct_type(prop, "Object");
@ -788,7 +788,7 @@ static void rna_def_depsgraph(BlenderRNA *brna)
NULL,
NULL,
NULL);
RNA_def_property_ui_text(prop, "Updates", "Updates to datablocks");
RNA_def_property_ui_text(prop, "Updates", "Updates to data-blocks");
}
void RNA_def_depsgraph(BlenderRNA *brna)

10
source/blender/makesrna/intern/rna_fcurve.c
View File

@ -58,9 +58,9 @@ const EnumPropertyItem rna_enum_fmodifier_type_items[] = {
"ENVELOPE",
0,
"Envelope",
"Reshape F-Curve values - e.g. change amplitude of movements"},
"Reshape F-Curve values, e.g. change amplitude of movements"},
{FMODIFIER_TYPE_CYCLES, "CYCLES", 0, "Cycles", "Cyclic extend/repeat keyframe sequence"},
{FMODIFIER_TYPE_NOISE, "NOISE", 0, "Noise", "Add pseudo-random noise on top of F-Curves"},
{FMODIFIER_TYPE_NOISE, "NOISE", 0, "Noise", "Add pseudorandom noise on top of F-Curves"},
/*{FMODIFIER_TYPE_FILTER, "FILTER", 0, "Filter", ""},*/ /* FIXME: not implemented yet! */
/*{FMODIFIER_TYPE_PYTHON, "PYTHON", 0, "Python", ""},*/ /* FIXME: not implemented yet! */
{FMODIFIER_TYPE_LIMITS,
@ -72,7 +72,7 @@ const EnumPropertyItem rna_enum_fmodifier_type_items[] = {
"STEPPED",
0,
"Stepped Interpolation",
"Snap values to nearest grid-step - e.g. for a stop-motion look"},
"Snap values to nearest grid step, e.g. for a stop-motion look"},
{0, NULL, 0, NULL, NULL},
};
@ -97,12 +97,12 @@ const EnumPropertyItem rna_enum_beztriple_keyframe_type_items[] = {
"KEYFRAME",
ICON_KEYTYPE_KEYFRAME_VEC,
"Keyframe",
"Normal keyframe - e.g. for key poses"},
"Normal keyframe, e.g. for key poses"},
{BEZT_KEYTYPE_BREAKDOWN,
"BREAKDOWN",
ICON_KEYTYPE_BREAKDOWN_VEC,
"Breakdown",
"A breakdown pose - e.g. for transitions between key poses"},
"A breakdown pose, e.g. for transitions between key poses"},
{BEZT_KEYTYPE_MOVEHOLD,
"MOVING_HOLD",
ICON_KEYTYPE_MOVING_HOLD_VEC,

4
source/blender/makesrna/intern/rna_gpencil.c
View File

@ -2419,7 +2419,7 @@ static void rna_def_gpencil_data(BlenderRNA *brna)
RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_DATA_AUTOLOCK_LAYERS);
RNA_def_property_ui_text(
prop,
"Autolock Layers",
"Auto-Lock Layers",
"Lock automatically all layers except active one to avoid accidental changes");
RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_autolock");
@ -2537,7 +2537,7 @@ static void rna_def_gpencil_data(BlenderRNA *brna)
prop = RNA_def_property(srna, "is_annotation", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_DATA_ANNOTATIONS);
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_property_ui_text(prop, "Annotation", "Current datablock is an annotation");
RNA_def_property_ui_text(prop, "Annotation", "Current data-block is an annotation");
/* Nested Structs */
prop = RNA_def_property(srna, "grid", PROP_POINTER, PROP_NONE);

6
source/blender/makesrna/intern/rna_image.c
View File

@ -1021,7 +1021,7 @@ static void rna_def_image(BlenderRNA *brna)
prop = RNA_def_property(srna, "use_generated_float", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "gen_flag", IMA_GEN_FLOAT);
RNA_def_property_ui_text(prop, "Float Buffer", "Generate floating point buffer");
RNA_def_property_ui_text(prop, "Float Buffer", "Generate floating-point buffer");
RNA_def_property_update(prop, NC_IMAGE | ND_DISPLAY, "rna_Image_generated_update");
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
@ -1106,7 +1106,7 @@ static void rna_def_image(BlenderRNA *brna)
prop = RNA_def_property(srna, "pixels", PROP_FLOAT, PROP_NONE);
RNA_def_property_flag(prop, PROP_DYNAMIC);
RNA_def_property_multi_array(prop, 1, NULL);
RNA_def_property_ui_text(prop, "Pixels", "Image pixels in floating point values");
RNA_def_property_ui_text(prop, "Pixels", "Image pixels in floating-point values");
RNA_def_property_dynamic_array_funcs(prop, "rna_Image_pixels_get_length");
RNA_def_property_float_funcs(prop, "rna_Image_pixels_get", "rna_Image_pixels_set", NULL);
@ -1118,7 +1118,7 @@ static void rna_def_image(BlenderRNA *brna)
prop = RNA_def_property(srna, "is_float", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_funcs(prop, "rna_Image_is_float_get", NULL);
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_property_ui_text(prop, "Is Float", "True if this image is stored in float buffer");
RNA_def_property_ui_text(prop, "Is Float", "True if this image is stored in floating-point buffer");
prop = RNA_def_property(srna, "colorspace_settings", PROP_POINTER, PROP_NONE);
RNA_def_property_pointer_sdna(prop, NULL, "colorspace_settings");

2
source/blender/makesrna/intern/rna_image_api.c
View File

@ -316,7 +316,7 @@ void RNA_api_image(StructRNA *srna)
RNA_def_function_ui_description(func, "Reload the image from its source path");
func = RNA_def_function(srna, "update", "rna_Image_update");
RNA_def_function_ui_description(func, "Update the display image from the floating point buffer");
RNA_def_function_ui_description(func, "Update the display image from the floating-point buffer");
RNA_def_function_flag(func, FUNC_USE_REPORTS);
func = RNA_def_function(srna, "scale", "rna_Image_scale");

4
source/blender/makesrna/intern/rna_main.c
View File

@ -387,8 +387,8 @@ void RNA_def_main(BlenderRNA *brna)
{"lightprobes",
"LightProbe",
"rna_Main_lightprobes_begin",
"LightProbes",
"LightProbe data-blocks",
"Light Probes",
"Light Probe data-blocks",
RNA_def_main_lightprobes},
# ifdef WITH_HAIR_NODES
{"hairs", "Hair", "rna_Main_hairs_begin", "Hairs", "Hair data-blocks", RNA_def_main_hairs},

2
source/blender/makesrna/intern/rna_main_api.c
View File

@ -1206,7 +1206,7 @@ void RNA_def_main_images(BlenderRNA *brna, PropertyRNA *cprop)
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
RNA_def_boolean(func, "alpha", 0, "Alpha", "Use alpha channel");
RNA_def_boolean(
func, "float_buffer", 0, "Float Buffer", "Create an image with floating point color");
func, "float_buffer", 0, "Float Buffer", "Create an image with floating-point color");
RNA_def_boolean(func, "stereo3d", 0, "Stereo 3D", "Create left and right views");
RNA_def_boolean(func, "is_data", 0, "Is Data", "Create image with non-color data color space");
RNA_def_boolean(func, "tiled", 0, "Tiled", "Create a tiled image");

20
source/blender/makesrna/intern/rna_mesh.c
View File

@ -999,7 +999,7 @@ static int rna_MeshFaceMapLayer_data_length(PointerRNA *ptr)
static PointerRNA rna_Mesh_face_map_new(struct Mesh *me, ReportList *reports, const char *name)
{
if (BKE_mesh_ensure_facemap_customdata(me) == false) {
BKE_report(reports, RPT_ERROR, "Currently only single face-map layers are supported");
BKE_report(reports, RPT_ERROR, "Currently only single face map layers are supported");
return PointerRNA_NULL;
}
@ -1027,14 +1027,14 @@ static void rna_Mesh_face_map_remove(struct Mesh *me,
CustomDataLayer *layer_test = &pdata->layers[index];
if (layer != layer_test) {
/* don't show name, its likely freed memory */
BKE_report(reports, RPT_ERROR, "FaceMap not in mesh");
BKE_report(reports, RPT_ERROR, "Face map not in mesh");
return;
}
}
}
if (BKE_mesh_clear_facemap_customdata(me) == false) {
BKE_report(reports, RPT_ERROR, "Error removing face-map");
BKE_report(reports, RPT_ERROR, "Error removing face map");
}
}
@ -2180,7 +2180,7 @@ static void rna_def_mproperties(BlenderRNA *brna)
RNA_def_struct_sdna(srna, "CustomDataLayer"); \
RNA_def_struct_ui_text(srna, \
"Mesh " elemname " Float Property Layer", \
"User defined layer of floating point number values"); \
"User defined layer of floating-point number values"); \
RNA_def_struct_path_func(srna, "rna_Mesh" elemname "FloatPropertyLayer_path"); \
\
prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); \
@ -2207,7 +2207,7 @@ static void rna_def_mproperties(BlenderRNA *brna)
RNA_def_struct_ui_text( \
srna, \
"Mesh " elemname " Float Property", \
"User defined floating point number value in a float properties layer"); \
"User defined floating-point number value in a float properties layer"); \
RNA_def_struct_path_func(srna, "rna_Mesh" elemname "FloatProperty_path"); \
\
prop = RNA_def_property(srna, "value", PROP_FLOAT, PROP_NONE); \
@ -2829,7 +2829,7 @@ static void rna_def_paint_mask(BlenderRNA *brna, PropertyRNA *UNUSED(cprop))
srna = RNA_def_struct(brna, "MeshPaintMaskProperty", NULL);
RNA_def_struct_sdna(srna, "MFloatProperty");
RNA_def_struct_ui_text(srna, "Mesh Paint Mask Property", "Floating point paint mask value");
RNA_def_struct_ui_text(srna, "Mesh Paint Mask Property", "Floating-point paint mask value");
RNA_def_struct_path_func(srna, "rna_MeshPaintMask_path");
prop = RNA_def_property(srna, "value", PROP_FLOAT, PROP_NONE);
@ -2851,7 +2851,7 @@ static void rna_def_face_map(BlenderRNA *brna)
prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
RNA_def_struct_name_property(srna, prop);
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_MeshPolyLayer_name_set");
RNA_def_property_ui_text(prop, "Name", "Name of face-map layer");
RNA_def_property_ui_text(prop, "Name", "Name of face map layer");
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
prop = RNA_def_property(srna, "data", PROP_COLLECTION, PROP_NONE);
@ -2888,13 +2888,13 @@ static void rna_def_face_maps(BlenderRNA *brna, PropertyRNA *cprop)
srna = RNA_def_struct(brna, "MeshFaceMapLayers", NULL);
RNA_def_struct_ui_text(srna, "Mesh Face Map Layer", "Per-face map index");
RNA_def_struct_sdna(srna, "Mesh");
RNA_def_struct_ui_text(srna, "Mesh FaceMaps", "Collection of mesh face-maps");
RNA_def_struct_ui_text(srna, "Mesh Face Maps", "Collection of mesh face maps");
/* add this since we only ever have one layer anyway, don't bother with active_index */
prop = RNA_def_property(srna, "active", PROP_POINTER, PROP_NONE);
RNA_def_property_struct_type(prop, "MeshFaceMapLayer");
RNA_def_property_pointer_funcs(prop, "rna_Mesh_face_map_active_get", NULL, NULL, NULL);
RNA_def_property_ui_text(prop, "Active FaceMap Layer", "");
RNA_def_property_ui_text(prop, "Active Face Map Layer", "");
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
FunctionRNA *func;
@ -3163,7 +3163,7 @@ static void rna_def_mesh(BlenderRNA *brna)
NULL);
RNA_def_property_struct_type(prop, "MeshFaceMapLayer");
RNA_def_property_override_flag(prop, PROPOVERRIDE_IGNORE);
RNA_def_property_ui_text(prop, "FaceMap", "");
RNA_def_property_ui_text(prop, "Face Map", "");
rna_def_face_maps(brna, prop);
/* Skin vertices */

14
source/blender/makesrna/intern/rna_nodetree.c
View File

@ -4183,7 +4183,7 @@ static const EnumPropertyItem node_script_mode_items[] = {
};
static EnumPropertyItem node_ies_mode_items[] = {
{NODE_IES_INTERNAL, "INTERNAL", 0, "Internal", "Use internal text datablock"},
{NODE_IES_INTERNAL, "INTERNAL", 0, "Internal", "Use internal text data-block"},
{NODE_IES_EXTERNAL, "EXTERNAL", 0, "External", "Use external .ies file"},
{0, NULL, 0, NULL, NULL},
};
@ -4564,7 +4564,7 @@ static void def_sh_attribute(StructRNA *srna)
"OBJECT",
0,
"Object",
"The attribute is associated with the object or mesh datablock itself, "
"The attribute is associated with the object or mesh data-block itself, "
"and its value is uniform"},
{SHD_ATTRIBUTE_INSTANCER,
"INSTANCER",
@ -5712,7 +5712,7 @@ static void def_sh_tex_ies(StructRNA *srna)
RNA_def_property_enum_funcs(prop, NULL, "rna_ShaderNodeTexIES_mode_set", NULL);
RNA_def_property_enum_items(prop, node_ies_mode_items);
RNA_def_property_ui_text(
prop, "Source", "Whether the IES file is loaded from disk or from a Text datablock");
prop, "Source", "Whether the IES file is loaded from disk or from a text data-block");
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
RNA_def_struct_sdna_from(srna, "bNode", NULL);
@ -5855,7 +5855,7 @@ static void def_cmp_blur(StructRNA *srna)
prop = RNA_def_property(srna, "use_variable_size", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "custom1", CMP_NODEFLAG_BLUR_VARIABLE_SIZE);
RNA_def_property_ui_text(
prop, "Variable Size", "Support variable blur per-pixel when using an image for size input");
prop, "Variable Size", "Support variable blur per pixel when using an image for size input");
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
prop = RNA_def_property(srna, "use_extended_bounds", PROP_BOOLEAN, PROP_NONE);
@ -7675,7 +7675,7 @@ static void def_cmp_bokehblur(StructRNA *srna)
prop = RNA_def_property(srna, "use_variable_size", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "custom1", CMP_NODEFLAG_BLUR_VARIABLE_SIZE);
RNA_def_property_ui_text(
prop, "Variable Size", "Support variable blur per-pixel when using an image for size input");
prop, "Variable Size", "Support variable blur per pixel when using an image for size input");
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
prop = RNA_def_property(srna, "use_extended_bounds", PROP_BOOLEAN, PROP_NONE);
@ -8968,7 +8968,7 @@ static void rna_def_node_socket_float(BlenderRNA *brna,
}
srna = RNA_def_struct(brna, idname, "NodeSocketStandard");
RNA_def_struct_ui_text(srna, "Float Node Socket", "Floating point number socket of a node");
RNA_def_struct_ui_text(srna, "Float Node Socket", "Floating-point number socket of a node");
RNA_def_struct_sdna(srna, "bNodeSocket");
RNA_def_struct_sdna_from(srna, "bNodeSocketValueFloat", "default_value");
@ -8985,7 +8985,7 @@ static void rna_def_node_socket_float(BlenderRNA *brna,
/* socket interface */
srna = RNA_def_struct(brna, interface_idname, "NodeSocketInterfaceStandard");
RNA_def_struct_ui_text(
srna, "Float Node Socket Interface", "Floating point number socket of a node");
srna, "Float Node Socket Interface", "Floating-point number socket of a node");
RNA_def_struct_sdna(srna, "bNodeSocket");
RNA_def_struct_sdna_from(srna, "bNodeSocketValueFloat", "default_value");

4
source/blender/makesrna/intern/rna_object.c
View File

@ -1972,7 +1972,7 @@ static void rna_Object_fmap_remove(Object *ob, ReportList *reports, PointerRNA *
bFaceMap *fmap = fmap_ptr->data;
if (BLI_findindex(&ob->fmaps, fmap) == -1) {
BKE_reportf(
reports, RPT_ERROR, "FaceMap '%s' not in object '%s'", fmap->name, ob->id.name + 2);
reports, RPT_ERROR, "Face map '%s' not in object '%s'", fmap->name, ob->id.name + 2);
return;
}
@ -2156,7 +2156,7 @@ static void rna_def_face_map(BlenderRNA *brna)
prop = RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", SELECT);
RNA_def_property_ui_text(prop, "Select", "Face-map selection state (for tools to use)");
RNA_def_property_ui_text(prop, "Select", "Face map selection state (for tools to use)");
/* important not to use a notifier here, creates a feedback loop! */
prop = RNA_def_property(srna, "index", PROP_INT, PROP_UNSIGNED);

2
source/blender/makesrna/intern/rna_particle.c
View File

@ -3137,7 +3137,7 @@ static void rna_def_particle_settings(BlenderRNA *brna)
prop = RNA_def_property(srna, "drag_factor", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_sdna(prop, NULL, "dragfac");
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_ui_text(prop, "Drag", "Amount of air-drag");
RNA_def_property_ui_text(prop, "Drag", "Amount of air drag");
RNA_def_property_update(prop, 0, "rna_Particle_reset");
prop = RNA_def_property(srna, "brownian_factor", PROP_FLOAT, PROP_NONE);

2
source/blender/makesrna/intern/rna_render.c
View File

@ -586,7 +586,7 @@ static void rna_def_render_engine(BlenderRNA *brna)
func = RNA_def_function(srna, "begin_result", "RE_engine_begin_result");
RNA_def_function_ui_description(
func, "Create render result to write linear floating point render layers and passes");
func, "Create render result to write linear floating-point render layers and passes");
parm = RNA_def_int(func, "x", 0, 0, INT_MAX, "X", "", 0, INT_MAX);
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
parm = RNA_def_int(func, "y", 0, 0, INT_MAX, "Y", "", 0, INT_MAX);

2
source/blender/makesrna/intern/rna_rna.c
View File

@ -3222,7 +3222,7 @@ void RNA_def_rna(BlenderRNA *brna)
srna = RNA_def_struct(brna, "FloatProperty", "Property");
RNA_def_struct_ui_text(srna,
"Float Definition",
"RNA floating point number (single precision) property definition");
"RNA floating-point number (single precision) property definition");
rna_def_number_property(srna, PROP_FLOAT);
/* StringProperty */

10
source/blender/makesrna/intern/rna_scene.c
View File

@ -246,7 +246,7 @@ const EnumPropertyItem rna_enum_curve_fit_method_items[] = {
"REFIT",
0,
"Refit",
"Incrementally re-fit the curve (high quality)"},
"Incrementally refit the curve (high quality)"},
{CURVE_PAINT_FIT_METHOD_SPLIT,
"SPLIT",
0,
@ -5445,7 +5445,7 @@ static void rna_def_image_format_stereo3d_format(BlenderRNA *brna)
prop = RNA_def_property(srna, "use_sidebyside_crosseyed", PROP_BOOLEAN, PROP_BOOLEAN);
RNA_def_property_boolean_sdna(prop, NULL, "flag", S3D_SIDEBYSIDE_CROSSEYED);
RNA_def_property_ui_text(prop, "Cross-Eyed", "Right eye should see left image and vice-versa");
RNA_def_property_ui_text(prop, "Cross-Eyed", "Right eye should see left image and vice versa");
RNA_def_property_update(prop, NC_IMAGE | ND_DISPLAY, "rna_Stereo3dFormat_update");
prop = RNA_def_property(srna, "use_squeezed_frame", PROP_BOOLEAN, PROP_BOOLEAN);
@ -7626,14 +7626,14 @@ void RNA_def_scene(BlenderRNA *brna)
prop = RNA_def_property(srna, "frame_subframe", PROP_FLOAT, PROP_TIME);
RNA_def_property_float_sdna(prop, NULL, "r.subframe");
RNA_def_property_ui_text(prop, "Current Sub-Frame", "");
RNA_def_property_ui_text(prop, "Current Subframe", "");
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.01, 2);
RNA_def_property_update(prop, NC_SCENE | ND_FRAME, "rna_Scene_frame_update");
prop = RNA_def_property(srna, "frame_float", PROP_FLOAT, PROP_TIME);
RNA_def_property_ui_text(prop, "Current Sub-Frame", "");
RNA_def_property_ui_text(prop, "Current Subframe", "");
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_range(prop, MINAFRAME, MAXFRAME);
RNA_def_property_ui_range(prop, MINAFRAME, MAXFRAME, 0.1, 2);
@ -7744,7 +7744,7 @@ void RNA_def_scene(BlenderRNA *brna)
PROP_EDITABLE); /* DO NOT MAKE THIS EDITABLE, OR NLA EDITOR BREAKS */
RNA_def_property_ui_text(
prop,
"NLA TweakMode",
"NLA Tweak Mode",
"Whether there is any action referenced by NLA being edited (strictly read-only)");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_GRAPH, NULL);

4
source/blender/makesrna/intern/rna_scene_api.c
View File

@ -276,7 +276,7 @@ void RNA_api_scene(StructRNA *srna)
func, "frame", 0, MINAFRAME, MAXFRAME, "", "Frame number to set", MINAFRAME, MAXFRAME);
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
RNA_def_float(
func, "subframe", 0.0, 0.0, 1.0, "", "Sub-frame time, between 0.0 and 1.0", 0.0, 1.0);
func, "subframe", 0.0, 0.0, 1.0, "", "Subframe time, between 0.0 and 1.0", 0.0, 1.0);
RNA_def_function_flag(func, FUNC_USE_MAIN);
func = RNA_def_function(srna, "uvedit_aspect", "rna_Scene_uvedit_aspect");
@ -411,7 +411,7 @@ void RNA_api_scene(StructRNA *srna)
0.0001f,
1000.0f);
RNA_def_boolean(
func, "triangulate", 0, "Triangulate", "Export Polygons (Quads & NGons) as Triangles");
func, "triangulate", 0, "Triangulate", "Export polygons (quads and n-gons) as triangles");
RNA_def_enum(func,
"quad_method",
rna_enum_modifier_triangulate_quad_method_items,

4
source/blender/makesrna/intern/rna_sequencer.c
View File

@ -1943,8 +1943,8 @@ static void rna_def_sequence(BlenderRNA *brna)
RNA_def_property_boolean_sdna(prop, NULL, "cache_flag", SEQ_CACHE_STORE_PREPROCESSED);
RNA_def_property_ui_text(
prop,
"Cache Pre-Processed",
"Cache pre-processed images, for faster tweaking of effects at the cost of memory usage");
"Cache Preprocessed",
"Cache preprocessed images, for faster tweaking of effects at the cost of memory usage");
prop = RNA_def_property(srna, "use_cache_composite", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "cache_flag", SEQ_CACHE_STORE_COMPOSITE);

2
source/blender/makesrna/intern/rna_space.c
View File

@ -4360,7 +4360,7 @@ static void rna_def_space_view3d(BlenderRNA *brna)
RNA_def_property_ui_text(
prop,
"Local View",
"Display an isolated sub-set of objects, apart from the scene visibility");
"Display an isolated subset of objects, apart from the scene visibility");
prop = RNA_def_property(srna, "lens", PROP_FLOAT, PROP_UNIT_CAMERA);
RNA_def_property_float_sdna(prop, NULL, "lens");

4
source/blender/makesrna/intern/rna_ui.c
View File

@ -1448,7 +1448,7 @@ static void rna_def_panel(BlenderRNA *brna)
RNA_def_property_string_sdna(prop, NULL, "type->parent_id");
RNA_def_property_flag(prop, PROP_REGISTER_OPTIONAL);
RNA_def_property_ui_text(
prop, "Parent ID Name", "If this is set, the panel becomes a sub-panel");
prop, "Parent ID Name", "If this is set, the panel becomes a subpanel");
prop = RNA_def_property(srna, "bl_ui_units_x", PROP_INT, PROP_UNSIGNED);
RNA_def_property_int_sdna(prop, NULL, "type->ui_units_x");
@ -1519,7 +1519,7 @@ static void rna_def_uilist(BlenderRNA *brna)
prop = RNA_def_property(srna, "use_filter_invert", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "filter_flag", UILST_FLT_EXCLUDE);
RNA_def_property_ui_text(prop, "Invert", "Invert filtering (show hidden items, and vice-versa)");
RNA_def_property_ui_text(prop, "Invert", "Invert filtering (show hidden items, and vice versa)");
/* WARNING: This is sort of an abuse, sort-by-alpha is actually a value,
* should even be an enum in full logic (of two values, sort by index and sort by name).

8
source/blender/makesrna/intern/rna_userdef.c
View File

@ -2455,7 +2455,7 @@ static void rna_def_userdef_theme_space_graph(BlenderRNA *brna)
prop = RNA_def_property(srna, "dopesheet_subchannel", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, NULL, "ds_subchannel");
RNA_def_property_array(prop, 3);
RNA_def_property_ui_text(prop, "Dope Sheet Sub-Channel", "");
RNA_def_property_ui_text(prop, "Dope Sheet Subchannel", "");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
prop = RNA_def_property(srna, "channel_group", PROP_FLOAT, PROP_COLOR_GAMMA);
@ -3334,7 +3334,7 @@ static void rna_def_userdef_theme_space_action(BlenderRNA *brna)
prop = RNA_def_property(srna, "dopesheet_subchannel", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, NULL, "ds_subchannel");
RNA_def_property_array(prop, 4);
RNA_def_property_ui_text(prop, "Dope Sheet Sub-Channel", "");
RNA_def_property_ui_text(prop, "Dope Sheet Subchannel", "");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
prop = RNA_def_property(srna, "channels", PROP_FLOAT, PROP_COLOR_GAMMA);
@ -5763,7 +5763,7 @@ static void rna_def_userdef_input(BlenderRNA *brna)
RNA_def_property_ui_range(prop, DEG2RADF(0.001f), DEG2RADF(15.0f), 1.0f, 2);
RNA_def_property_ui_text(prop,
"Orbit Sensitivity",
"Rotation amount per-pixel to control how fast the viewport orbits");
"Rotation amount per pixel to control how fast the viewport orbits");
prop = RNA_def_property(srna, "view_rotate_sensitivity_trackball", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_range(prop, 0.1f, 10.0f);
@ -5776,7 +5776,7 @@ static void rna_def_userdef_input(BlenderRNA *brna)
RNA_def_property_ui_text(prop,
"Mouse Drag Threshold",
"Number of pixels to drag before a tweak/drag event is triggered "
"for mouse/track-pad input "
"for mouse/trackpad input "
"(otherwise click events are detected)");
prop = RNA_def_property(srna, "drag_threshold_tablet", PROP_INT, PROP_PIXEL);

2
source/blender/makesrna/intern/rna_wm.c
View File

@ -2310,7 +2310,7 @@ static void rna_def_window_stereo3d(BlenderRNA *brna)
prop = RNA_def_property(srna, "use_sidebyside_crosseyed", PROP_BOOLEAN, PROP_BOOLEAN);
RNA_def_property_boolean_sdna(prop, NULL, "flag", S3D_SIDEBYSIDE_CROSSEYED);
RNA_def_property_ui_text(prop, "Cross-Eyed", "Right eye should see left image and vice-versa");
RNA_def_property_ui_text(prop, "Cross-Eyed", "Right eye should see left image and vice versa");
}
static void rna_def_window(BlenderRNA *brna)

2
source/blender/makesrna/intern/rna_wm_gizmo.c
View File

@ -1288,7 +1288,7 @@ static void rna_def_gizmo(BlenderRNA *brna, PropertyRNA *cprop)
prop = RNA_def_property(srna, "use_tooltip", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_funcs(
prop, "rna_Gizmo_flag_use_tooltip_get", "rna_Gizmo_flag_use_tooltip_set");
RNA_def_property_ui_text(prop, "Use Tooltip", "Use tool-tips when hovering over this gizmo");
RNA_def_property_ui_text(prop, "Use Tooltip", "Use tooltips when hovering over this gizmo");
/* No update needed. */
/* wmGizmo.state (readonly) */

2
source/blender/makesrna/intern/rna_workspace.c
View File

@ -295,7 +295,7 @@ static void rna_def_workspace_tool(BlenderRNA *brna)
RNA_define_verify_sdna(0);
prop = RNA_def_property(srna, "has_datablock", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_property_ui_text(prop, "Has Datablock", "");
RNA_def_property_ui_text(prop, "Has Data-Block", "");
RNA_def_property_boolean_funcs(prop, "rna_WorkSpaceTool_has_datablock_get", NULL);
RNA_define_verify_sdna(1);

2
source/blender/windowmanager/intern/wm_operators.c
View File

@ -3618,7 +3618,7 @@ static void WM_OT_stereo3d_set(wmOperatorType *ot)
"use_sidebyside_crosseyed",
false,
"Cross-Eyed",
"Right eye should see left image and vice-versa");
"Right eye should see left image and vice versa");
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
}

2
source/creator/creator_args.c
View File

@ -1079,7 +1079,7 @@ static int arg_handle_debug_value_set(int argc, const char **argv, void *UNUSED(
static const char arg_handle_debug_fpe_set_doc[] =
"\n\t"
"Enable floating point exceptions.";
"Enable floating-point exceptions.";
static int arg_handle_debug_fpe_set(int UNUSED(argc),
const char **UNUSED(argv),
void *UNUSED(data))