diff --git a/release/datafiles/colormanagement/config.ocio b/release/datafiles/colormanagement/config.ocio index e223c8da9f6..098e4f621db 100644 --- a/release/datafiles/colormanagement/config.ocio +++ b/release/datafiles/colormanagement/config.ocio @@ -347,7 +347,7 @@ colorspaces: equalitygroup: bitdepth: 32f description: | - Log Encoding with Chroma inset and rotation, and with 25 Stops of Dynamic Range + Log Encoding with Chroma inset and rotation of primaries, and with 25 Stops of Dynamic Range isdata: false from_reference: ! children: diff --git a/source/blender/blenloader/intern/readfile.cc b/source/blender/blenloader/intern/readfile.cc index a85c7f55f25..a640deb8af6 100644 --- a/source/blender/blenloader/intern/readfile.cc +++ b/source/blender/blenloader/intern/readfile.cc @@ -4621,7 +4621,7 @@ static FileData *read_library_file_data(FileData *basefd, BLO_reportf_wrap(basefd->reports, RPT_INFO, - RPT_("Read packed library: '%s', parent '%s'"), + RPT_("Read packed library: '%s', parent '%s'"), mainptr->curlib->filepath, library_parent_filepath(mainptr->curlib)); fd = blo_filedata_from_memory(pf->data, pf->size, basefd->reports); @@ -4633,7 +4633,7 @@ static FileData *read_library_file_data(FileData *basefd, /* Read file on disk. */ BLO_reportf_wrap(basefd->reports, RPT_INFO, - RPT_("Read library: '%s', '%s', parent '%s'"), + RPT_("Read library: '%s', '%s', parent '%s'"), mainptr->curlib->runtime.filepath_abs, mainptr->curlib->filepath, library_parent_filepath(mainptr->curlib)); diff --git a/source/blender/editors/io/io_collada.cc b/source/blender/editors/io/io_collada.cc index 7c455614945..1e4a02869f9 100644 --- a/source/blender/editors/io/io_collada.cc +++ b/source/blender/editors/io/io_collada.cc @@ -570,7 +570,7 @@ void WM_OT_collada_export(wmOperatorType *ot) true, "Include Animations", "Export animations if available (exporting animations will enforce the decomposition of " - "node transforms into and components)"); + "node transforms into and components)"); RNA_def_boolean(ot->srna, "include_all_actions", diff --git a/source/blender/editors/mesh/editmesh_tools.cc b/source/blender/editors/mesh/editmesh_tools.cc index 2f10a44c03c..4488d62387f 100644 --- a/source/blender/editors/mesh/editmesh_tools.cc +++ b/source/blender/editors/mesh/editmesh_tools.cc @@ -9511,7 +9511,7 @@ void MESH_OT_normals_tools(wmOperatorType *ot) "absolute", false, "Absolute Coordinates", - "Copy Absolute coordinates or Normal vector"); + "Copy Absolute coordinates of Normal vector"); } /** \} */ diff --git a/source/blender/editors/object/object_add.cc b/source/blender/editors/object/object_add.cc index 47a863884f1..66c7cf92bed 100644 --- a/source/blender/editors/object/object_add.cc +++ b/source/blender/editors/object/object_add.cc @@ -1587,14 +1587,14 @@ void OBJECT_OT_gpencil_add(wmOperatorType *ot) "use_in_front", true, "Show In Front", - "Show line art grease pencil in front of everything"); + "Show Line Art grease pencil in front of everything"); RNA_def_float(ot->srna, "stroke_depth_offset", 0.05f, 0.0f, FLT_MAX, "Stroke Offset", - "Stroke offset for the line art modifier", + "Stroke offset for the Line Art modifier", 0.0f, 0.5f); RNA_def_boolean( @@ -1768,14 +1768,14 @@ void OBJECT_OT_grease_pencil_add(wmOperatorType *ot) "use_in_front", true, "Show In Front", - "Show line art grease pencil in front of everything"); + "Show Line Art grease pencil in front of everything"); RNA_def_float(ot->srna, "stroke_depth_offset", 0.05f, 0.0f, FLT_MAX, "Stroke Offset", - "Stroke offset for the line art modifier", + "Stroke offset for the Line Art modifier", 0.0f, 0.5f); RNA_def_boolean( diff --git a/source/blender/editors/space_image/image_buttons.cc b/source/blender/editors/space_image/image_buttons.cc index 3da057bc197..57f97ab9fcc 100644 --- a/source/blender/editors/space_image/image_buttons.cc +++ b/source/blender/editors/space_image/image_buttons.cc @@ -1204,7 +1204,7 @@ void uiTemplateImageInfo(uiLayout *layout, bContext *C, Image *ima, ImageUser *i eGPUTextureFormat texture_format = IMB_gpu_get_texture_format( ibuf, ima->flag & IMA_HIGH_BITDEPTH, ibuf->planes >= 8); const char *texture_format_description = GPU_texture_format_name(texture_format); - ofs += BLI_snprintf_rlen(str + ofs, len - ofs, RPT_(", %s"), texture_format_description); + ofs += BLI_snprintf_rlen(str + ofs, len - ofs, RPT_(", %s"), texture_format_description); uiItemL(col, str, ICON_NONE); } diff --git a/source/blender/editors/space_node/node_relationships.cc b/source/blender/editors/space_node/node_relationships.cc index bb1991cfe11..5446bea1cab 100644 --- a/source/blender/editors/space_node/node_relationships.cc +++ b/source/blender/editors/space_node/node_relationships.cc @@ -1455,7 +1455,7 @@ void NODE_OT_link_make(wmOperatorType *ot) { /* identifiers */ ot->name = "Make Links"; - ot->description = "Makes a link between selected output in input sockets"; + ot->description = "Make a link between selected output and input sockets"; ot->idname = "NODE_OT_link_make"; /* callbacks */ diff --git a/source/blender/editors/space_outliner/outliner_edit.cc b/source/blender/editors/space_outliner/outliner_edit.cc index 20224a981a9..331cafd2ea9 100644 --- a/source/blender/editors/space_outliner/outliner_edit.cc +++ b/source/blender/editors/space_outliner/outliner_edit.cc @@ -2216,7 +2216,7 @@ static int outliner_orphans_purge_invoke(bContext *C, wmOperator *op, const wmEv return WM_operator_props_dialog_popup(C, op, unused_message_popup_width_compute(C), - IFACE_("Purge Unused Data From This File"), + IFACE_("Purge Unused Data from This File"), IFACE_("Delete")); } diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_lineart.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_lineart.cc index 7a07518547e..9d96497bb0b 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_lineart.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_lineart.cc @@ -438,7 +438,7 @@ static void options_light_reference_draw(const bContext * /*C*/, Panel *panel) uiLayoutSetEnabled(layout, !is_baked); if (use_cache && !is_first) { - uiItemL(layout, "Cached from the first line art modifier.", ICON_INFO); + uiItemL(layout, "Cached from the first Line Art modifier.", ICON_INFO); return; } @@ -470,7 +470,7 @@ static void options_panel_draw(const bContext * /*C*/, Panel *panel) uiLayoutSetEnabled(layout, !is_baked); if (use_cache && !is_first) { - uiItemL(layout, RPT_("Cached from the first line art modifier"), ICON_INFO); + uiItemL(layout, RPT_("Cached from the first Line Art modifier"), ICON_INFO); return; } @@ -650,7 +650,7 @@ static void face_mark_panel_draw(const bContext * /*C*/, Panel *panel) uiLayoutSetEnabled(layout, !is_baked); if (use_cache && !is_first) { - uiItemL(layout, RPT_("Cached from the first line art modifier"), ICON_INFO); + uiItemL(layout, RPT_("Cached from the first Line Art modifier"), ICON_INFO); return; } @@ -681,7 +681,7 @@ static void chaining_panel_draw(const bContext * /*C*/, Panel *panel) uiLayoutSetEnabled(layout, !is_baked); if (use_cache && !is_first) { - uiItemL(layout, RPT_("Cached from the first line art modifier"), ICON_INFO); + uiItemL(layout, RPT_("Cached from the first Line Art modifier"), ICON_INFO); return; } @@ -722,7 +722,7 @@ static void vgroup_panel_draw(const bContext * /*C*/, Panel *panel) uiLayoutSetEnabled(layout, !is_baked); if (use_cache && !is_first) { - uiItemL(layout, RPT_("Cached from the first line art modifier"), ICON_INFO); + uiItemL(layout, RPT_("Cached from the first Line Art modifier"), ICON_INFO); return; } diff --git a/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_ops.cc b/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_ops.cc index 33f6249607e..8686419d0bb 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_ops.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_ops.cc @@ -290,7 +290,7 @@ static int lineart_gpencil_bake_common(bContext *C, if (!bake_all_targets) { Object *ob = CTX_data_active_object(C); if (!ob || ob->type != OB_GPENCIL_LEGACY) { - WM_report(RPT_ERROR, "No active object or active object isn't a GPencil object"); + WM_report(RPT_ERROR, "No active object, or active object isn't a Grease Pencil object"); return OPERATOR_FINISHED; } BLI_linklist_prepend(&bj->objects, ob); @@ -429,7 +429,7 @@ static int lineart_gpencil_clear_strokes_all_exec(bContext *C, wmOperator *op) } CTX_DATA_END; - BKE_report(op->reports, RPT_INFO, "All line art objects are now cleared"); + BKE_report(op->reports, RPT_INFO, "All Line Art objects are now cleared"); return OPERATOR_FINISHED; } @@ -437,7 +437,7 @@ static int lineart_gpencil_clear_strokes_all_exec(bContext *C, wmOperator *op) void OBJECT_OT_lineart_bake_strokes(wmOperatorType *ot) { ot->name = "Bake Line Art"; - ot->description = "Bake Line Art for current GPencil object"; + ot->description = "Bake Line Art for current Grease Pencil object"; ot->idname = "OBJECT_OT_lineart_bake_strokes"; ot->invoke = lineart_gpencil_bake_strokes_invoke; @@ -448,7 +448,7 @@ void OBJECT_OT_lineart_bake_strokes(wmOperatorType *ot) void OBJECT_OT_lineart_bake_strokes_all(wmOperatorType *ot) { ot->name = "Bake Line Art (All)"; - ot->description = "Bake all Grease Pencil objects that have a line art modifier"; + ot->description = "Bake all Grease Pencil objects that have a Line Art modifier"; ot->idname = "OBJECT_OT_lineart_bake_strokes_all"; ot->invoke = lineart_gpencil_bake_strokes_all_invoke; @@ -459,7 +459,7 @@ void OBJECT_OT_lineart_bake_strokes_all(wmOperatorType *ot) void OBJECT_OT_lineart_clear(wmOperatorType *ot) { ot->name = "Clear Baked Line Art"; - ot->description = "Clear all strokes in current GPencil object"; + ot->description = "Clear all strokes in current Grease Pencil object"; ot->idname = "OBJECT_OT_lineart_clear"; ot->exec = lineart_gpencil_clear_strokes_exec; @@ -468,7 +468,7 @@ void OBJECT_OT_lineart_clear(wmOperatorType *ot) void OBJECT_OT_lineart_clear_all(wmOperatorType *ot) { ot->name = "Clear Baked Line Art (All)"; - ot->description = "Clear all strokes in all Grease Pencil objects that have a line art modifier"; + ot->description = "Clear all strokes in all Grease Pencil objects that have a Line Art modifier"; ot->idname = "OBJECT_OT_lineart_clear_all"; ot->exec = lineart_gpencil_clear_strokes_all_exec; diff --git a/source/blender/io/usd/intern/usd_asset_utils.cc b/source/blender/io/usd/intern/usd_asset_utils.cc index 841554470cf..28f9b30219c 100644 --- a/source/blender/io/usd/intern/usd_asset_utils.cc +++ b/source/blender/io/usd/intern/usd_asset_utils.cc @@ -192,7 +192,7 @@ bool copy_asset(const char *src, if (!ar.CanWriteAssetToPath(dst_path, &why_not)) { BKE_reportf(reports, RPT_ERROR, - "%s: Can't write to asset %s: %s", + "%s: Can't write to asset %s: %s", __func__, dst_path.GetPathString().c_str(), why_not.c_str()); diff --git a/source/blender/io/usd/intern/usd_hook.cc b/source/blender/io/usd/intern/usd_hook.cc index 8a3ed1d42e6..7b4fc6bc648 100644 --- a/source/blender/io/usd/intern/usd_hook.cc +++ b/source/blender/io/usd/intern/usd_hook.cc @@ -186,7 +186,7 @@ static void handle_python_error(USDHook *hook, ReportList *reports) BKE_reportf(reports, RPT_ERROR, - "An exception occurred invoking USD hook '%s'. Please see the console for details", + "An exception occurred invoking USD hook '%s'. Please see the console for details", hook->name); } diff --git a/source/blender/io/usd/intern/usd_skel_convert.cc b/source/blender/io/usd/intern/usd_skel_convert.cc index 58ad9814751..18cd7b61de1 100644 --- a/source/blender/io/usd/intern/usd_skel_convert.cc +++ b/source/blender/io/usd/intern/usd_skel_convert.cc @@ -763,7 +763,7 @@ void import_skeleton(Main *bmain, if (bind_xforms.size() != num_joints) { BKE_reportf(reports, RPT_WARNING, - "%s: Mismatch in bind xforms and joint counts for skeleton %s", + "%s: Mismatch in bind xforms and joint counts for skeleton %s", __func__, skel.GetPath().GetAsString().c_str()); return; diff --git a/source/blender/makesrna/intern/rna_animviz.cc b/source/blender/makesrna/intern/rna_animviz.cc index cab908caf43..55fd2cb059b 100644 --- a/source/blender/makesrna/intern/rna_animviz.cc +++ b/source/blender/makesrna/intern/rna_animviz.cc @@ -282,7 +282,7 @@ static void rna_def_animviz_paths(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Start Frame", "Starting frame of range of paths to display/calculate " - "(not for 'Around Current Frame' Onion-skinning method)"); + "(not for 'Around Frame' Onion-skinning method)"); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW_ANIMVIZ, nullptr); prop = RNA_def_property(srna, "frame_end", PROP_INT, PROP_TIME); @@ -291,7 +291,7 @@ static void rna_def_animviz_paths(BlenderRNA *brna) RNA_def_property_ui_text(prop, "End Frame", "End frame of range of paths to display/calculate " - "(not for 'Around Current Frame' Onion-skinning method)"); + "(not for 'Around Frame' Onion-skinning method)"); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW_ANIMVIZ, nullptr); /* Around Current Ranges */ @@ -301,7 +301,7 @@ static void rna_def_animviz_paths(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Before Current", "Number of frames to show before the current frame " - "(only for 'Around Current Frame' Onion-skinning method)"); + "(only for 'Around Frame' Onion-skinning method)"); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW_ANIMVIZ, nullptr); prop = RNA_def_property(srna, "frame_after", PROP_INT, PROP_TIME); @@ -310,7 +310,7 @@ static void rna_def_animviz_paths(BlenderRNA *brna) RNA_def_property_ui_text(prop, "After Current", "Number of frames to show after the current frame " - "(only for 'Around Current Frame' Onion-skinning method)"); + "(only for 'Around Frame' Onion-skinning method)"); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW_ANIMVIZ, nullptr); /* Readonly Property - Do any motion paths exist/need updating? (Mainly for bone paths) */ diff --git a/source/blender/makesrna/intern/rna_brush.cc b/source/blender/makesrna/intern/rna_brush.cc index aa7d57bea8c..1565ba302a6 100644 --- a/source/blender/makesrna/intern/rna_brush.cc +++ b/source/blender/makesrna/intern/rna_brush.cc @@ -3058,7 +3058,9 @@ static void rna_def_brush(BlenderRNA *brna) RNA_def_property_range(prop, 0, 1.0f); RNA_def_property_ui_range(prop, 0, 0.2f, 1, 3); RNA_def_property_ui_text( - prop, "Brush Height", "Affectable height of brush (layer height for layer tool, i.e.)"); + prop, + "Brush Height", + "Affectable height of brush (i.e. the layer height for the layer tool)"); RNA_def_property_update(prop, 0, "rna_Brush_update"); prop = RNA_def_property(srna, "texture_sample_bias", PROP_FLOAT, PROP_DISTANCE); diff --git a/source/blender/makesrna/intern/rna_camera.cc b/source/blender/makesrna/intern/rna_camera.cc index 90a1181d9b8..66fb298d571 100644 --- a/source/blender/makesrna/intern/rna_camera.cc +++ b/source/blender/makesrna/intern/rna_camera.cc @@ -421,7 +421,11 @@ static void rna_def_camera_stereo_data(BlenderRNA *brna) static const EnumPropertyItem convergence_mode_items[] = { {CAM_S3D_OFFAXIS, "OFFAXIS", 0, "Off-Axis", "Off-axis frustums converging in a plane"}, {CAM_S3D_PARALLEL, "PARALLEL", 0, "Parallel", "Parallel cameras with no convergence"}, - {CAM_S3D_TOE, "TOE", 0, "Toe-in", "Rotated cameras, looking at the convergence distance"}, + {CAM_S3D_TOE, + "TOE", + 0, + "Toe-in", + "Rotated cameras, looking at the same point at the convergence distance"}, {0, nullptr, 0, nullptr, nullptr}, }; diff --git a/source/blender/makesrna/intern/rna_collection.cc b/source/blender/makesrna/intern/rna_collection.cc index b745881cdb5..38429b67d09 100644 --- a/source/blender/makesrna/intern/rna_collection.cc +++ b/source/blender/makesrna/intern/rna_collection.cc @@ -694,7 +694,7 @@ void RNA_def_collections(BlenderRNA *brna) RNA_def_property_collection_sdna(prop, nullptr, "children", nullptr); RNA_def_property_ui_text(prop, "Collection Children", - "Children collections their parent-collection-specific settings"); + "Children collections with their parent-collection-specific settings"); /* Export Handlers. */ prop = RNA_def_property(srna, "exporters", PROP_COLLECTION, PROP_NONE); @@ -741,7 +741,7 @@ void RNA_def_collections(BlenderRNA *brna) 0, "Occlusion Only", "Only use the collection to produce occlusion"}, - {COLLECTION_LRT_EXCLUDE, "EXCLUDE", 0, "Exclude", "Don't use this collection in line art"}, + {COLLECTION_LRT_EXCLUDE, "EXCLUDE", 0, "Exclude", "Don't use this collection in Line Art"}, {COLLECTION_LRT_INTERSECTION_ONLY, "INTERSECTION_ONLY", 0, @@ -761,7 +761,7 @@ void RNA_def_collections(BlenderRNA *brna) prop = RNA_def_property(srna, "lineart_usage", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, rna_collection_lineart_usage); - RNA_def_property_ui_text(prop, "Usage", "How to use this collection in line art"); + RNA_def_property_ui_text(prop, "Usage", "How to use this collection in Line Art calculation"); RNA_def_property_update(prop, NC_SCENE, nullptr); prop = RNA_def_property(srna, "lineart_use_intersection_mask", PROP_BOOLEAN, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_gpencil_legacy_modifier.cc b/source/blender/makesrna/intern/rna_gpencil_legacy_modifier.cc index 91c713317f8..38223970981 100644 --- a/source/blender/makesrna/intern/rna_gpencil_legacy_modifier.cc +++ b/source/blender/makesrna/intern/rna_gpencil_legacy_modifier.cc @@ -49,12 +49,12 @@ const EnumPropertyItem rna_enum_object_greasepencil_modifier_type_items[] = { "GP_WEIGHT_ANGLE", ICON_MOD_VERTEX_WEIGHT, "Vertex Weight Angle", - "Generate Vertex Weights base on stroke angle"}, + "Generate vertex weights based on stroke angle"}, {eGpencilModifierType_WeightProximity, "GP_WEIGHT_PROXIMITY", ICON_MOD_VERTEX_WEIGHT, "Vertex Weight Proximity", - "Generate Vertex Weights base on distance to object"}, + "Generate vertex weights based on distance to object"}, RNA_ENUM_ITEM_HEADING(N_("Generate"), nullptr), {eGpencilModifierType_Array, @@ -86,7 +86,7 @@ const EnumPropertyItem rna_enum_object_greasepencil_modifier_type_items[] = { "GP_LINEART", ICON_MOD_LINEART, "Line Art", - "Generate line art strokes from selected source"}, + "Generate Line Art strokes from selected source"}, {eGpencilModifierType_Mirror, "GP_MIRROR", ICON_MOD_MIRROR, @@ -2437,12 +2437,13 @@ static void rna_def_modifier_gpencilarray(BlenderRNA *brna) prop = RNA_def_property(srna, "use_object_offset", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, nullptr, "flag", GP_ARRAY_USE_OB_OFFSET); - RNA_def_property_ui_text(prop, "Use Object Offset", "Enable object offset"); + RNA_def_property_ui_text( + prop, "Use Object Offset", "Add another object's transformation to the total offset"); RNA_def_property_update(prop, 0, "rna_GpencilModifier_update"); prop = RNA_def_property(srna, "use_relative_offset", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, nullptr, "flag", GP_ARRAY_USE_RELATIVE); - RNA_def_property_ui_text(prop, "Shift", "Enable shift"); + RNA_def_property_ui_text(prop, "Shift", "Add an offset relative to the object's bounding box"); RNA_def_property_update(prop, 0, "rna_GpencilModifier_update"); prop = RNA_def_property(srna, "use_uniform_random_scale", PROP_BOOLEAN, PROP_NONE); @@ -2692,8 +2693,7 @@ static void rna_def_modifier_gpencillattice(BlenderRNA *brna) PropertyRNA *prop; srna = RNA_def_struct(brna, "LatticeGpencilModifier", "GpencilModifier"); - RNA_def_struct_ui_text( - srna, "Lattice Modifier", "Change stroke using lattice to deform modifier"); + RNA_def_struct_ui_text(srna, "Lattice Modifier", "Deform strokes using a lattice object"); RNA_def_struct_sdna(srna, "LatticeGpencilModifierData"); RNA_def_struct_ui_icon(srna, ICON_MOD_LATTICE); @@ -2841,7 +2841,8 @@ static void rna_def_modifier_gpencilmirror(BlenderRNA *brna) prop = RNA_def_property(srna, "use_clip", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, nullptr, "flag", GP_MIRROR_CLIPPING); - RNA_def_property_ui_text(prop, "Clip", "Clip points"); + RNA_def_property_ui_text( + prop, "Clip", "Prevent points from going through the mirror during transform"); RNA_def_property_update(prop, 0, "rna_GpencilModifier_update"); prop = RNA_def_property(srna, "use_axis_x", PROP_BOOLEAN, PROP_NONE); @@ -3600,7 +3601,7 @@ static void rna_def_modifier_gpencillineart(BlenderRNA *brna) srna = RNA_def_struct(brna, "LineartGpencilModifier", "GpencilModifier"); RNA_def_struct_ui_text( - srna, "Line Art Modifier", "Generate line art strokes from selected source"); + srna, "Line Art Modifier", "Generate Line Art strokes from selected source"); RNA_def_struct_sdna(srna, "LineartGpencilModifierData"); RNA_def_struct_ui_icon(srna, ICON_MOD_LINEART); @@ -3633,7 +3634,7 @@ static void rna_def_modifier_gpencillineart(BlenderRNA *brna) prop, nullptr, "calculation_flags", MOD_LINEART_ALLOW_DUPLI_OBJECTS); RNA_def_property_ui_text(prop, "Instanced Objects", - "Allow particle objects and face/vertex instances to show in line art"); + "Allow particle objects and face/vertex instances to show in Line Art"); RNA_def_property_update(prop, NC_SCENE, "rna_GpencilModifier_update"); prop = RNA_def_property(srna, "use_edge_overlap", PROP_BOOLEAN, PROP_NONE); @@ -3659,8 +3660,8 @@ static void rna_def_modifier_gpencillineart(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Crease Threshold", "Angles smaller than this will be treated as creases. Crease angle " - "priority: object line art crease override > mesh auto smooth angle > " - "line art default crease"); + "priority: object Line Art crease override > mesh auto smooth angle > " + "Line Art default crease"); RNA_def_property_update(prop, NC_SCENE, "rna_GpencilModifier_update"); prop = RNA_def_property(srna, "split_angle", PROP_FLOAT, PROP_ANGLE); @@ -3780,7 +3781,7 @@ static void rna_def_modifier_gpencillineart(BlenderRNA *brna) RNA_def_property_struct_type(prop, "Object"); RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY); RNA_def_property_ui_text( - prop, "Camera Object", "Use specified camera object for generating line art"); + prop, "Camera Object", "Use specified camera object for generating Line Art strokes"); RNA_def_property_update(prop, 0, "rna_GpencilModifier_dependency_update"); prop = RNA_def_property(srna, "light_contour_object", PROP_POINTER, PROP_NONE); @@ -3793,7 +3794,7 @@ static void rna_def_modifier_gpencillineart(BlenderRNA *brna) prop = RNA_def_property(srna, "source_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, modifier_lineart_source_type); - RNA_def_property_ui_text(prop, "Source Type", "Line art stroke source type"); + RNA_def_property_ui_text(prop, "Source Type", "Line Art stroke source type"); RNA_def_property_update(prop, 0, "rna_GpencilModifier_dependency_update"); prop = RNA_def_property(srna, "source_object", PROP_POINTER, PROP_NONE); @@ -3929,7 +3930,7 @@ static void rna_def_modifier_gpencillineart(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, nullptr, "flags", MOD_LINEART_USE_CACHE); RNA_def_property_ui_text(prop, "Use Cache", - "Use cached scene data from the first line art modifier in the stack. " + "Use cached scene data from the first Line Art modifier in the stack. " "Certain settings will be unavailable"); RNA_def_property_update(prop, 0, "rna_GpencilModifier_update"); diff --git a/source/blender/makesrna/intern/rna_mask.cc b/source/blender/makesrna/intern/rna_mask.cc index 13a87a1d923..be8415fe0e5 100644 --- a/source/blender/makesrna/intern/rna_mask.cc +++ b/source/blender/makesrna/intern/rna_mask.cc @@ -1035,7 +1035,7 @@ static void rna_def_mask_layer(BlenderRNA *brna) prop = RNA_def_property(srna, "falloff", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, nullptr, "falloff"); RNA_def_property_enum_items(prop, rna_enum_proportional_falloff_curve_only_items); - RNA_def_property_ui_text(prop, "Falloff", "Falloff type the feather"); + RNA_def_property_ui_text(prop, "Falloff", "Falloff type of the feather"); RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_ID_CURVE_LEGACY); /* Abusing id_curve :/ */ RNA_def_property_update(prop, NC_MASK | NA_EDITED, nullptr); diff --git a/source/blender/makesrna/intern/rna_material.cc b/source/blender/makesrna/intern/rna_material.cc index 4464a819a21..162e2db3925 100644 --- a/source/blender/makesrna/intern/rna_material.cc +++ b/source/blender/makesrna/intern/rna_material.cc @@ -1058,7 +1058,7 @@ void RNA_def_material(BlenderRNA *brna) /* line art */ prop = RNA_def_property(srna, "lineart", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, nullptr, "lineart"); - RNA_def_property_ui_text(prop, "Line Art Settings", "Line art settings for material"); + RNA_def_property_ui_text(prop, "Line Art Settings", "Line Art settings for material"); rna_def_material_greasepencil(brna); rna_def_material_lineart(brna); diff --git a/source/blender/makesrna/intern/rna_modifier.cc b/source/blender/makesrna/intern/rna_modifier.cc index 30a9aabf341..cbea266508d 100644 --- a/source/blender/makesrna/intern/rna_modifier.cc +++ b/source/blender/makesrna/intern/rna_modifier.cc @@ -55,7 +55,7 @@ const EnumPropertyItem rna_enum_object_modifier_type_items[] = { "GREASE_PENCIL_VERTEX_WEIGHT_PROXIMITY", ICON_MOD_VERTEX_WEIGHT, "Vertex Weight Proximity", - "Generate Vertex Weights base on distance to object"}, + "Generate vertex weights based on distance to object"}, RNA_ENUM_ITEM_HEADING(N_("Modify"), nullptr), {eModifierType_DataTransfer, @@ -128,7 +128,7 @@ const EnumPropertyItem rna_enum_object_modifier_type_items[] = { "GREASE_PENCIL_VERTEX_WEIGHT_ANGLE", ICON_MOD_VERTEX_WEIGHT, "Vertex Weight Angle", - "Generate vertex weights base on stroke angle"}, + "Generate vertex weights based on stroke angle"}, {eModifierType_GreasePencilTime, "GREASE_PENCIL_TIME", ICON_MOD_TIME, @@ -253,7 +253,7 @@ const EnumPropertyItem rna_enum_object_modifier_type_items[] = { "LINEART", ICON_GREASEPENCIL, "Line Art", - "Generate line art from scene geometries"}, + "Generate Line Art from scene geometries"}, {eModifierType_GreasePencilMirror, "GREASE_PENCIL_MIRROR", ICON_MOD_MIRROR, @@ -8491,7 +8491,7 @@ static void rna_def_modifier_grease_pencil_lineart(BlenderRNA *brna) srna = RNA_def_struct(brna, "GreasePencilLineartModifier", "Modifier"); RNA_def_struct_ui_text( - srna, "Line Art Modifier", "Generate line art strokes from selected source"); + srna, "Line Art Modifier", "Generate Line Art strokes from selected source"); RNA_def_struct_sdna(srna, "GreasePencilLineartModifierData"); RNA_def_struct_ui_icon(srna, ICON_MOD_LINEART); @@ -8524,7 +8524,7 @@ static void rna_def_modifier_grease_pencil_lineart(BlenderRNA *brna) prop, nullptr, "calculation_flags", MOD_LINEART_ALLOW_DUPLI_OBJECTS); RNA_def_property_ui_text(prop, "Instanced Objects", - "Allow particle objects and face/vertex instances to show in line art"); + "Allow particle objects and face/vertex instances to show in Line Art"); RNA_def_property_update(prop, NC_SCENE, "rna_Modifier_update"); prop = RNA_def_property(srna, "use_edge_overlap", PROP_BOOLEAN, PROP_NONE); @@ -8550,8 +8550,8 @@ static void rna_def_modifier_grease_pencil_lineart(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Crease Threshold", "Angles smaller than this will be treated as creases. Crease angle " - "priority: object line art crease override > mesh auto smooth angle > " - "line art default crease"); + "priority: object Line Art crease override > mesh auto smooth angle > " + "Line Art default crease"); RNA_def_property_update(prop, NC_SCENE, "rna_Modifier_update"); prop = RNA_def_property(srna, "split_angle", PROP_FLOAT, PROP_ANGLE); @@ -8672,7 +8672,7 @@ static void rna_def_modifier_grease_pencil_lineart(BlenderRNA *brna) RNA_def_property_struct_type(prop, "Object"); RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY); RNA_def_property_ui_text( - prop, "Camera Object", "Use specified camera object for generating line art"); + prop, "Camera Object", "Use specified camera object for generating Line Art strokes"); RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update"); prop = RNA_def_property(srna, "light_contour_object", PROP_POINTER, PROP_NONE); @@ -8685,7 +8685,7 @@ static void rna_def_modifier_grease_pencil_lineart(BlenderRNA *brna) prop = RNA_def_property(srna, "source_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, modifier_lineart_source_type); - RNA_def_property_ui_text(prop, "Source Type", "Line art stroke source type"); + RNA_def_property_ui_text(prop, "Source Type", "Line Art stroke source type"); RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update"); prop = RNA_def_property(srna, "source_object", PROP_POINTER, PROP_NONE); @@ -8822,7 +8822,7 @@ static void rna_def_modifier_grease_pencil_lineart(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, nullptr, "flags", LINEART_GPENCIL_USE_CACHE); RNA_def_property_ui_text(prop, "Use Cache", - "Use cached scene data from the first line art modifier in the stack. " + "Use cached scene data from the first Line Art modifier in the stack. " "Certain settings will be unavailable"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); @@ -9540,12 +9540,13 @@ static void rna_def_modifier_grease_pencil_array(BlenderRNA *brna) prop = RNA_def_property(srna, "use_object_offset", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, nullptr, "flag", MOD_GREASE_PENCIL_ARRAY_USE_OB_OFFSET); - RNA_def_property_ui_text(prop, "Use Object Offset", "Enable object offset"); + RNA_def_property_ui_text( + prop, "Use Object Offset", "Add another object's transformation to the total offset"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); prop = RNA_def_property(srna, "use_relative_offset", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, nullptr, "flag", MOD_GREASE_PENCIL_ARRAY_USE_RELATIVE); - RNA_def_property_ui_text(prop, "Shift", "Enable shift"); + RNA_def_property_ui_text(prop, "Shift", "Add an offset relative to the object's bounding box"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); prop = RNA_def_property(srna, "use_uniform_random_scale", PROP_BOOLEAN, PROP_NONE); @@ -10338,7 +10339,7 @@ static void rna_def_modifier_grease_pencil_envelope(BlenderRNA *brna) srna = RNA_def_struct(brna, "GreasePencilEnvelopeModifier", "Modifier"); RNA_def_struct_ui_text( - srna, "Grease Pencil Envelope Modifier", "AEnvelope stroke effect modifier"); + srna, "Grease Pencil Envelope Modifier", "Envelope stroke effect modifier"); RNA_def_struct_sdna(srna, "GreasePencilEnvelopeModifierData"); RNA_def_struct_ui_icon(srna, ICON_MOD_ENVELOPE); diff --git a/source/blender/makesrna/intern/rna_nodetree.cc b/source/blender/makesrna/intern/rna_nodetree.cc index 78d7d49d4cc..77c9ced1b20 100644 --- a/source/blender/makesrna/intern/rna_nodetree.cc +++ b/source/blender/makesrna/intern/rna_nodetree.cc @@ -6548,7 +6548,7 @@ static void def_cmp_dilate_erode(StructRNA *srna) prop = RNA_def_property(srna, "falloff", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, nullptr, "falloff"); RNA_def_property_enum_items(prop, rna_enum_proportional_falloff_curve_only_items); - RNA_def_property_ui_text(prop, "Falloff", "Falloff type the feather"); + RNA_def_property_ui_text(prop, "Falloff", "Falloff type of the feather"); RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_ID_CURVE_LEGACY); /* Abusing id_curve :/ */ RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); @@ -8368,7 +8368,7 @@ static void def_cmp_keying(StructRNA *srna) prop = RNA_def_property(srna, "feather_falloff", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, nullptr, "feather_falloff"); RNA_def_property_enum_items(prop, rna_enum_proportional_falloff_curve_only_items); - RNA_def_property_ui_text(prop, "Feather Falloff", "Falloff type the feather"); + RNA_def_property_ui_text(prop, "Feather Falloff", "Falloff type of the feather"); RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_ID_CURVE_LEGACY); /* Abusing id_curve :/ */ RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); diff --git a/source/blender/makesrna/intern/rna_object.cc b/source/blender/makesrna/intern/rna_object.cc index a382b4a0024..e3faecddd40 100644 --- a/source/blender/makesrna/intern/rna_object.cc +++ b/source/blender/makesrna/intern/rna_object.cc @@ -162,17 +162,17 @@ const EnumPropertyItem rna_enum_object_gpencil_type_items[] = { "LINEART_SCENE", ICON_SCENE_DATA, "Scene Line Art", - "Quickly set up line art for the entire scene"}, + "Quickly set up Line Art for the entire scene"}, {GREASE_PENCIL_LINEART_COLLECTION, "LINEART_COLLECTION", ICON_OUTLINER_COLLECTION, "Collection Line Art", - "Quickly set up line art for the active collection"}, + "Quickly set up Line Art for the active collection"}, {GREASE_PENCIL_LINEART_OBJECT, "LINEART_OBJECT", ICON_OBJECT_DATA, "Object Line Art", - "Quickly set up line art for the active object"}, + "Quickly set up Line Art for the active object"}, {0, nullptr, 0, nullptr, nullptr}}; static const EnumPropertyItem parent_type_items[] = { @@ -2877,13 +2877,13 @@ static void rna_def_object_lineart(BlenderRNA *brna) }; srna = RNA_def_struct(brna, "ObjectLineArt", nullptr); - RNA_def_struct_ui_text(srna, "Object Line Art", "Object line art settings"); + RNA_def_struct_ui_text(srna, "Object Line Art", "Object Line Art settings"); RNA_def_struct_sdna(srna, "ObjectLineArt"); RNA_def_struct_path_func(srna, "rna_ObjectLineArt_path"); prop = RNA_def_property(srna, "usage", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, prop_feature_line_usage_items); - RNA_def_property_ui_text(prop, "Usage", "How to use this object in line art calculation"); + RNA_def_property_ui_text(prop, "Usage", "How to use this object in Line Art calculation"); RNA_def_property_update(prop, 0, "rna_object_lineart_update"); prop = RNA_def_property(srna, "use_crease_override", PROP_BOOLEAN, PROP_NONE); @@ -3787,7 +3787,7 @@ static void rna_def_object(BlenderRNA *brna) /* Line Art */ prop = RNA_def_property(srna, "lineart", PROP_POINTER, PROP_NONE); RNA_def_property_struct_type(prop, "ObjectLineArt"); - RNA_def_property_ui_text(prop, "Line Art", "Line art settings for the object"); + RNA_def_property_ui_text(prop, "Line Art", "Line Art settings for the object"); /* Mesh Symmetry Settings */ diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.cc b/source/blender/makesrna/intern/rna_sculpt_paint.cc index 9d35a4863c2..a4f4c407266 100644 --- a/source/blender/makesrna/intern/rna_sculpt_paint.cc +++ b/source/blender/makesrna/intern/rna_sculpt_paint.cc @@ -1475,7 +1475,7 @@ static void rna_def_gpencil_guides(BlenderRNA *brna) srna = RNA_def_struct(brna, "GPencilSculptGuide", nullptr); RNA_def_struct_sdna(srna, "GP_Sculpt_Guide"); RNA_def_struct_path_func(srna, "rna_GPencilSculptGuide_path"); - RNA_def_struct_ui_text(srna, "GPencil Sculpt Guide", "Guides for drawing"); + RNA_def_struct_ui_text(srna, "Grease Pencil Sculpt Guide", "Guides for drawing"); static const EnumPropertyItem prop_gpencil_guidetypes[] = { {GP_GUIDE_CIRCULAR, "CIRCULAR", 0, "Circular", "Use single point to create rings"}, diff --git a/source/blender/makesrna/intern/rna_sequencer.cc b/source/blender/makesrna/intern/rna_sequencer.cc index f61f40b0108..3fed2180920 100644 --- a/source/blender/makesrna/intern/rna_sequencer.cc +++ b/source/blender/makesrna/intern/rna_sequencer.cc @@ -2306,11 +2306,10 @@ static void rna_def_sequence(BlenderRNA *brna) prop = RNA_def_property(srna, "use_default_fade", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, nullptr, "flag", SEQ_USE_EFFECT_DEFAULT_FADE); - RNA_def_property_ui_text( - prop, - "Use Default Fade", - "Fade effect using the built-in default (usually make transition as long as " - "effect strip)"); + RNA_def_property_ui_text(prop, + "Use Default Fade", + "Fade effect using the built-in default (usually makes the transition " + "as long as the effect strip)"); RNA_def_property_update( prop, NC_SCENE | ND_SEQUENCER, "rna_Sequence_invalidate_preprocessed_update"); diff --git a/source/blender/makesrna/intern/rna_userdef.cc b/source/blender/makesrna/intern/rna_userdef.cc index fbef392b803..9d687c4af1f 100644 --- a/source/blender/makesrna/intern/rna_userdef.cc +++ b/source/blender/makesrna/intern/rna_userdef.cc @@ -5714,8 +5714,9 @@ static void rna_def_userdef_edit(BlenderRNA *brna) prop = RNA_def_property(srna, "use_duplicate_grease_pencil", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, nullptr, "dupflag", USER_DUP_GPENCIL); - RNA_def_property_ui_text( - prop, "Duplicate GPencil", "Causes grease pencil data to be duplicated with the object"); + RNA_def_property_ui_text(prop, + "Duplicate Grease Pencil", + "Causes grease pencil data to be duplicated with the object"); prop = RNA_def_property(srna, "use_duplicate_curves", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, nullptr, "dupflag", USER_DUP_CURVES); @@ -6705,7 +6706,7 @@ static void rna_def_userdef_filepaths_extension_repo(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Custom Directory", "Manually set the path for extensions to be stored. " - "When disabled a users extensions directory is created"); + "When disabled a user's extensions directory is created"); RNA_def_property_boolean_funcs( prop, nullptr, "rna_userdef_extension_repo_use_custom_directory_set"); diff --git a/source/blender/modifiers/intern/MOD_lineart.cc b/source/blender/modifiers/intern/MOD_lineart.cc index 0434c9f68d6..1859ce92f8e 100644 --- a/source/blender/modifiers/intern/MOD_lineart.cc +++ b/source/blender/modifiers/intern/MOD_lineart.cc @@ -406,7 +406,7 @@ static void options_panel_draw(const bContext * /*C*/, Panel *panel) uiLayoutSetEnabled(layout, !is_baked); if (use_cache && !is_first) { - uiItemL(layout, TIP_("Cached from the first line art modifier"), ICON_INFO); + uiItemL(layout, TIP_("Cached from the first Line Art modifier"), ICON_INFO); return; } @@ -584,7 +584,7 @@ static void face_mark_panel_draw(const bContext * /*C*/, Panel *panel) uiLayoutSetEnabled(layout, !is_baked); if (use_cache && !is_first) { - uiItemL(layout, TIP_("Cached from the first line art modifier"), ICON_INFO); + uiItemL(layout, TIP_("Cached from the first Line Art modifier"), ICON_INFO); return; } @@ -614,7 +614,7 @@ static void chaining_panel_draw(const bContext * /*C*/, Panel *panel) uiLayoutSetEnabled(layout, !is_baked); if (use_cache && !is_first) { - uiItemL(layout, TIP_("Cached from the first line art modifier"), ICON_INFO); + uiItemL(layout, TIP_("Cached from the first Line Art modifier"), ICON_INFO); return; } @@ -654,7 +654,7 @@ static void vgroup_panel_draw(const bContext * /*C*/, Panel *panel) uiLayoutSetEnabled(layout, !is_baked); if (use_cache && !is_first) { - uiItemL(layout, TIP_("Cached from the first line art modifier"), ICON_INFO); + uiItemL(layout, TIP_("Cached from the first Line Art modifier"), ICON_INFO); return; } diff --git a/source/blender/nodes/geometry/nodes/node_geo_proximity.cc b/source/blender/nodes/geometry/nodes/node_geo_proximity.cc index c654c85604d..17003968b9b 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_proximity.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_proximity.cc @@ -41,7 +41,7 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output("Is Valid") .dependent_field({2, 3}) .description( - "Whether the sampling was successfull. It can fail when the sampled group is empty"); + "Whether the sampling was successful. It can fail when the sampled group is empty"); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/nodes/geometry/nodes/node_geo_remove_attribute.cc b/source/blender/nodes/geometry/nodes/node_geo_remove_attribute.cc index ebe3f0a7677..d03d1182ecf 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_remove_attribute.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_remove_attribute.cc @@ -156,7 +156,7 @@ static void node_rna(StructRNA *srna) 0, "Wildcard", "Remove all attributes that match the pattern which is allowed to contain a single " - "wildcard (*)."}, + "wildcard (*)"}, {0, nullptr, 0, nullptr, nullptr}, }; RNA_def_node_enum(srna, diff --git a/source/blender/nodes/geometry/nodes/node_geo_sample_nearest_surface.cc b/source/blender/nodes/geometry/nodes/node_geo_sample_nearest_surface.cc index 688398215d7..d046324b978 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_sample_nearest_surface.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_sample_nearest_surface.cc @@ -46,7 +46,7 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output("Is Valid") .dependent_field({3, 4}) .description( - "Whether the sampling was successfull. It can fail when the sampled group is empty"); + "Whether the sampling was successful. It can fail when the sampled group is empty"); } static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) diff --git a/source/blender/windowmanager/intern/wm_files.cc b/source/blender/windowmanager/intern/wm_files.cc index 229fb175f31..3c5a0477b02 100644 --- a/source/blender/windowmanager/intern/wm_files.cc +++ b/source/blender/windowmanager/intern/wm_files.cc @@ -955,7 +955,7 @@ static void file_read_reports_finalize(BlendFileReadReport *bf_reports) if (bf_reports->resynced_lib_overrides_libraries_count != 0) { BKE_reportf(bf_reports->reports, RPT_WARNING, - "%d libraries have overrides needing resync (auto resynced in %.0fm%.2fs), " + "%d libraries have overrides needing resync (auto resynced in %.0fm%.2fs), " "please check the Info editor for details", bf_reports->resynced_lib_overrides_libraries_count, duration_lib_override_recursive_resync_minutes, @@ -2568,7 +2568,7 @@ static int wm_userpref_read_invoke(bContext *C, wmOperator *op, const wmEvent * C, op, title.c_str(), - IFACE_("To make changes to Preferences permanent, use \"Save Preferences.\""), + IFACE_("To make changes to Preferences permanent, use \"Save Preferences\""), IFACE_("Load"), ALERT_ICON_WARNING, false);