Commit: 538d4cc998c0a919773df4697cf7cfc5a69c62c3 Author: Damien Picard Date: Fri Dec 9 15:41:05 2022 -0600 Branches: master https://developer.blender.org/rB538d4cc998c0a919773df4697cf7cfc5a69c62c3
UI: Fix and improve various labels and tooltips Improve a few messages, but mostly fix typos in many areas of the UI. See inline comments in the differential revisiion for the rationale behind the various changes. Differential Revision: https://developer.blender.org/D16716 =================================================================== M intern/cycles/blender/addon/properties.py M intern/cycles/blender/addon/ui.py M release/scripts/startup/bl_operators/presets.py M release/scripts/startup/bl_operators/uvcalc_lightmap.py M release/scripts/startup/bl_operators/wm.py M release/scripts/startup/bl_ui/space_sequencer.py M source/blender/blenkernel/intern/blendfile_link_append.c M source/blender/blenkernel/intern/crazyspace.cc M source/blender/draw/engines/eevee/eevee_lightprobes.c M source/blender/editors/io/io_cache.c M source/blender/editors/mesh/editmesh_tools.c M source/blender/editors/object/object_add.cc M source/blender/editors/object/object_edit.c M source/blender/editors/object/object_remesh.cc M source/blender/editors/object/object_transform.cc M source/blender/editors/space_action/action_edit.c M source/blender/editors/space_sequencer/sequencer_add.c M source/blender/editors/space_view3d/view3d_navigate_walk.c M source/blender/editors/space_view3d/view3d_select.cc M source/blender/editors/uvedit/uvedit_unwrap_ops.c M source/blender/makesrna/intern/rna_ID.c M source/blender/makesrna/intern/rna_access.c M source/blender/makesrna/intern/rna_color.c M source/blender/makesrna/intern/rna_curve.c M source/blender/makesrna/intern/rna_gpencil.c M source/blender/makesrna/intern/rna_gpencil_modifier.c M source/blender/makesrna/intern/rna_layer.c M source/blender/makesrna/intern/rna_modifier.c M source/blender/makesrna/intern/rna_object.c M source/blender/makesrna/intern/rna_scene.c M source/blender/makesrna/intern/rna_sequencer.c M source/blender/makesrna/intern/rna_space.c M source/blender/makesrna/intern/rna_tracking.c M source/blender/nodes/geometry/nodes/node_geo_instance_on_points.cc M source/blender/windowmanager/intern/wm_files.c =================================================================== diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index b535571138a..2da763b9eb1 100644 --- a/intern/cycles/blender/addon/properties.py +++ b/intern/cycles/blender/addon/properties.py @@ -1206,7 +1206,7 @@ class CyclesWorldSettings(bpy.types.PropertyGroup): ) homogeneous_volume: BoolProperty( name="Homogeneous Volume", - description="When using volume rendering, assume volume has the same density everywhere" + description="When using volume rendering, assume volume has the same density everywhere " "(not using any textures), for faster rendering", default=False, ) diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index d0d66d09442..c3477ae0284 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -193,7 +193,7 @@ class CYCLES_RENDER_PT_sampling_viewport(CyclesButtonsPanel, Panel): if cscene.use_preview_adaptive_sampling: col = layout.column(align=True) - col.prop(cscene, "preview_samples", text=" Max Samples") + col.prop(cscene, "preview_samples", text="Max Samples") col.prop(cscene, "preview_adaptive_min_samples", text="Min Samples") else: layout.prop(cscene, "preview_samples", text="Samples") @@ -255,7 +255,7 @@ class CYCLES_RENDER_PT_sampling_render(CyclesButtonsPanel, Panel): col = layout.column(align=True) if cscene.use_adaptive_sampling: - col.prop(cscene, "samples", text=" Max Samples") + col.prop(cscene, "samples", text="Max Samples") col.prop(cscene, "adaptive_min_samples", text="Min Samples") else: col.prop(cscene, "samples", text="Samples") diff --git a/release/scripts/startup/bl_operators/presets.py b/release/scripts/startup/bl_operators/presets.py index 2af310ddfdf..203eb128f0f 100644 --- a/release/scripts/startup/bl_operators/presets.py +++ b/release/scripts/startup/bl_operators/presets.py @@ -214,7 +214,7 @@ class AddPresetBase: class ExecutePreset(Operator): - """Execute a preset""" + """Load a preset""" bl_idname = "script.execute_preset" bl_label = "Execute a Python Preset" diff --git a/release/scripts/startup/bl_operators/uvcalc_lightmap.py b/release/scripts/startup/bl_operators/uvcalc_lightmap.py index 995ec721046..8c78424f54a 100644 --- a/release/scripts/startup/bl_operators/uvcalc_lightmap.py +++ b/release/scripts/startup/bl_operators/uvcalc_lightmap.py @@ -228,8 +228,8 @@ def lightmap_uvpack( """ BOX_DIV if the maximum division of the UV map that a box may be consolidated into. - Basically, a lower value will be slower but waist less space - and a higher value will have more clumpy boxes but more wasted space + A lower value will create more clumpy boxes and more wasted space, + and a higher value will be slower but waste less space """ import time from math import sqrt @@ -623,7 +623,10 @@ class LightMapPack(Operator): # UV Packing... PREF_BOX_DIV: IntProperty( name="Pack Quality", - description="Pre-packing before the complex boxpack", + description=( + "Quality of the packing. " + "Higher values will be slower but waste less space" + ), min=1, max=48, default=12, ) diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py index 14af0f5339e..abe304d84eb 100644 --- a/release/scripts/startup/bl_operators/wm.py +++ b/release/scripts/startup/bl_operators/wm.py @@ -2084,7 +2084,7 @@ class WM_OT_operator_cheat_sheet(Operator): # Add-on Operators class WM_OT_owner_enable(Operator): - """Enable workspace owner ID""" + """Enable add-on for workspace""" bl_idname = "wm.owner_enable" bl_label = "Enable Add-on" @@ -2099,9 +2099,9 @@ class WM_OT_owner_enable(Operator): class WM_OT_owner_disable(Operator): - """Enable workspace owner ID""" + """Disable add-on for workspace""" bl_idname = "wm.owner_disable" - bl_label = "Disable UI Tag" + bl_label = "Disable Add-on" owner_id: StringProperty( name="UI Tag", diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index e703cf7f9c6..1fed23a992c 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -2196,7 +2196,7 @@ class SEQUENCER_PT_cache_settings(SequencerButtonsPanel, Panel): col = layout.column(heading="Cache", align=True) col.prop(ed, "use_cache_raw", text="Raw") - col.prop(ed, "use_cache_preprocessed", text="Pre-Processed") + col.prop(ed, "use_cache_preprocessed", text="Preprocessed") col.prop(ed, "use_cache_composite", text="Composite") col.prop(ed, "use_cache_final", text="Final") @@ -2315,7 +2315,7 @@ class SEQUENCER_PT_strip_cache(SequencerButtonsPanel, Panel): col = layout.column(heading="Cache") col.prop(strip, "use_cache_raw", text="Raw") - col.prop(strip, "use_cache_preprocessed", text="Pre-Processed") + col.prop(strip, "use_cache_preprocessed", text="Preprocessed") col.prop(strip, "use_cache_composite", text="Composite") diff --git a/source/blender/blenkernel/intern/blendfile_link_append.c b/source/blender/blenkernel/intern/blendfile_link_append.c index 4dd225c09ec..ea68e939e5a 100644 --- a/source/blender/blenkernel/intern/blendfile_link_append.c +++ b/source/blender/blenkernel/intern/blendfile_link_append.c @@ -1001,7 +1001,7 @@ static void blendfile_link_append_proxies_convert(Main *bmain, ReportList *repor RPT_WARNING, "Proxies have been removed from Blender (%d proxies were automatically converted " "to library overrides, %d proxies could not be converted and were cleared). " - "Please consider re-saving any library .blend file with the newest Blender version", + "Consider re-saving any library .blend file with the newest Blender version", bf_reports.count.proxies_to_lib_overrides_success, bf_reports.count.proxies_to_lib_overrides_failures); } diff --git a/source/blender/blenkernel/intern/crazyspace.cc b/source/blender/blenkernel/intern/crazyspace.cc index f83c321c4ae..28281378d5a 100644 --- a/source/blender/blenkernel/intern/crazyspace.cc +++ b/source/blender/blenkernel/intern/crazyspace.cc @@ -571,7 +571,7 @@ void BKE_crazyspace_api_displacement_to_original(struct Object *object, if (vertex_index < 0 || vertex_index >= object->runtime.crazyspace_verts_num) { BKE_reportf(reports, RPT_ERROR, - "Invalid vertex index %d (expected to be within 0 to %d range))", + "Invalid vertex index %d (expected to be within 0 to %d range)", vertex_index, object->runtime.crazyspace_verts_num); return; diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c b/source/blender/draw/engines/eevee/eevee_lightprobes.c index eb111610706..ea22d2aa2e4 100644 --- a/source/blender/draw/engines/eevee/eevee_lightprobes.c +++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c @@ -79,7 +79,7 @@ static void planar_pool_ensure_alloc(EEVEE_Data *vedata, int num_planar_ref) EEVEE_StorageList *stl = vedata->stl; EEVEE_EffectsInfo *fx = stl->effects; - /* XXX TODO: OPTIMIZATION: This is a complete waist of texture memory. + /* XXX TODO: OPTIMIZATION: This is a complete waste of texture memory. * Instead of allocating each planar probe for each viewport, * only alloc them once using the biggest viewport resolution. */ diff --git a/source/blender/editors/io/io_cache.c b/source/blender/editors/io/io_cache.c index 969049313c9..d9ebef26a6f 100644 --- a/source/blender/editors/io/io_cache.c +++ b/source/blender/editors/io/io_cache.c @@ -247,7 +247,7 @@ static int cachefile_layer_remove_exec(bContext *C, wmOperator *UNUSED(op)) void CACHEFILE_OT_layer_remove(wmOperatorType *ot) { ot->name = "Add layer"; - ot->description = "Remove an override layer to the archive"; + ot->description = "Remove an override layer from the archive"; ot->idname = "CACHEFILE_OT_layer_remove"; /* api callbacks */ diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 8b29472f687..68675fab6b4 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -8687,7 +8687,7 @@ static int edbm_point_normals_modal(bContext *C, wmOperator *op, const wmEvent * break; default: - BKE_report(op->reports, RPT_WARNING, "Does not support Individual Origin as pivot"); + BKE_report(op->reports, RPT_WARNING, "Does not support Individual Origins as pivot"); copy_v3_v3(target, obedit->loc); } ret = OPERATOR_RUNNING_MODAL; diff --git a/source/blender/editors/object/object_add.cc b/source/blender/editors/object/object_add.cc index 6075e4250eb..72d9195cbb3 100644 --- a/source/blender/editors/object/object_add.cc +++ b/source/blender/editors/object/object_add.cc @@ -1554,7 +1554,7 @@ void OBJECT_OT_gpencil_add(wmOperatorType *ot) rna_enum_gpencil_add_stroke_depth_order_items, GP_DRAWMODE_3D, "Stroke Depth Order", - "Defines how the strokes are ordered in 3D space for objects not displayed 'In Front')"); + "Defines how the strokes are ordered in 3D space (for objects not displayed 'In Front')"); } /** \} */ diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 2e22e3bb00d..bc4e5668b42 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -1620,7 +1620,7 @@ void OBJECT_OT_shade_smooth(wmOperatorType *ot) RNA_def_property_float_default(prop, DEG2RADF(30.0f)); RNA_def_property_ui_text(prop, "Angle", - "Maximum angle between face normals that will be considered as smooth" + @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs