Commit: 30c90f0ad015ae23eb37780f64429ba9e406eafe Author: Damien Picard Date: Tue Jan 10 14:49:51 2023 -0500 Branches: master https://developer.blender.org/rB30c90f0ad015ae23eb37780f64429ba9e406eafe
Cleanup: Replace "UV's" with "UVs" An apostrophe should not be used because it is not a mark of plural, even for initialisms. This involves mostly comments, but a few UI messages are affected as well. Differential Revision: https://developer.blender.org/D16749 =================================================================== M doc/python_api/examples/bpy.types.Mesh.py M release/scripts/modules/bpy_extras/object_utils.py M release/scripts/startup/bl_operators/add_mesh_torus.py M release/scripts/startup/bl_operators/uvcalc_lightmap.py M source/blender/blenkernel/BKE_mesh.h M source/blender/blenkernel/BKE_pbvh_pixels.hh M source/blender/blenkernel/intern/mesh.cc M source/blender/blenkernel/intern/mesh_legacy_convert.cc M source/blender/blenkernel/intern/mesh_mapping.cc M source/blender/blenkernel/intern/mesh_merge_customdata.cc M source/blender/blenlib/BLI_uvproject.h M source/blender/blenloader/intern/versioning_280.c M source/blender/blenloader/intern/versioning_defaults.cc M source/blender/bmesh/bmesh.h M source/blender/bmesh/intern/bmesh_interp.c M source/blender/bmesh/intern/bmesh_opdefines.c M source/blender/bmesh/intern/bmesh_operators.h M source/blender/bmesh/intern/bmesh_walkers_impl.c M source/blender/bmesh/operators/bmo_inset.c M source/blender/bmesh/tools/bmesh_bevel.c M source/blender/bmesh/tools/bmesh_boolean.cc M source/blender/bmesh/tools/bmesh_intersect.c M source/blender/bmesh/tools/bmesh_path_region_uv.c M source/blender/draw/engines/overlay/overlay_edit_uv.cc M source/blender/draw/intern/draw_cache_impl_mesh.cc M source/blender/draw/intern/draw_manager.c M source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_angle.cc M source/blender/editors/include/ED_mesh.h M source/blender/editors/mesh/editmesh_tools.c M source/blender/editors/object/object_add.cc M source/blender/editors/object/object_modifier.cc M source/blender/editors/sculpt_paint/paint_image_proj.cc M source/blender/editors/sculpt_paint/sculpt_uv.c M source/blender/editors/transform/transform_convert.c M source/blender/editors/uvedit/uvedit_intern.h M source/blender/editors/uvedit/uvedit_ops.c M source/blender/editors/uvedit/uvedit_rip.c M source/blender/editors/uvedit/uvedit_select.c M source/blender/editors/uvedit/uvedit_smart_stitch.c M source/blender/editors/uvedit/uvedit_unwrap_ops.c M source/blender/makesdna/DNA_meshdata_types.h M source/blender/makesdna/DNA_scene_types.h M source/blender/makesrna/intern/rna_modifier.c M source/blender/makesrna/intern/rna_scene.c M source/blender/modifiers/intern/MOD_dynamicpaint.c M source/blender/windowmanager/intern/wm_event_system.cc =================================================================== diff --git a/doc/python_api/examples/bpy.types.Mesh.py b/doc/python_api/examples/bpy.types.Mesh.py index 68cc42ec6bf..8872201e123 100644 --- a/doc/python_api/examples/bpy.types.Mesh.py +++ b/doc/python_api/examples/bpy.types.Mesh.py @@ -13,16 +13,16 @@ Blender stores 4 main arrays to define mesh geometry. - :class:`Mesh.polygons`: (reference a range of loops) -Each polygon reference a slice in the loop array, this way, polygons do not store vertices or corner data such as UV's directly, +Each polygon references a slice in the loop array, this way, polygons do not store vertices or corner data such as UVs directly, only a reference to loops that the polygon uses. :class:`Mesh.loops`, :class:`Mesh.uv_layers` :class:`Mesh.vertex_colors` are all aligned so the same polygon loop -indices can be used to find the UV's and vertex colors as with as the vertices. +indices can be used to find the UVs and vertex colors as with as the vertices. To compare mesh API options see: :ref:`NGons and Tessellation Faces <info_gotcha_mesh_faces>` -This example script prints the vertices and UV's for each polygon, assumes the active object is a mesh with UVs. +This example script prints the vertices and UVs for each polygon, assumes the active object is a mesh with UVs. """ import bpy diff --git a/release/scripts/modules/bpy_extras/object_utils.py b/release/scripts/modules/bpy_extras/object_utils.py index 5275a83e062..efbd635955c 100644 --- a/release/scripts/modules/bpy_extras/object_utils.py +++ b/release/scripts/modules/bpy_extras/object_utils.py @@ -127,7 +127,7 @@ def object_data_add(context, obdata, operator=None, name=None): layer.update() # apply location # layer.objects.active = obj_new - # Match up UV layers, this is needed so adding an object with UV's + # Match up UV layers, this is needed so adding an object with UVs # doesn't create new layers when there happens to be a naming mismatch. uv_new = obdata.uv_layers.active if uv_new is not None: diff --git a/release/scripts/startup/bl_operators/add_mesh_torus.py b/release/scripts/startup/bl_operators/add_mesh_torus.py index 90d1326e1a2..88934d086a9 100644 --- a/release/scripts/startup/bl_operators/add_mesh_torus.py +++ b/release/scripts/startup/bl_operators/add_mesh_torus.py @@ -71,7 +71,7 @@ def add_uvs(mesh, minor_seg, major_seg): u_step = 1.0 / major_seg v_step = 1.0 / minor_seg - # Round UV's, needed when segments aren't divisible by 4. + # Round UVs, needed when segments aren't divisible by 4. u_init = 0.5 + fmod(0.5, u_step) v_init = 0.5 + fmod(0.5, v_step) diff --git a/release/scripts/startup/bl_operators/uvcalc_lightmap.py b/release/scripts/startup/bl_operators/uvcalc_lightmap.py index 8c78424f54a..ca309bff9e4 100644 --- a/release/scripts/startup/bl_operators/uvcalc_lightmap.py +++ b/release/scripts/startup/bl_operators/uvcalc_lightmap.py @@ -84,7 +84,7 @@ class prettyface: # ngon, note: # for ngons to calculate the width/height we need to do the # whole projection, unlike other faces - # we store normalized UV's in the faces coords to avoid + # we store normalized UVs in the faces coords to avoid # calculating the projection and rotating it twice. no = data.normal @@ -110,7 +110,7 @@ class prettyface: self.height = yspan # ngons work different, we store projected result - # in UV's to avoid having to re-project later. + # in UVs to avoid having to re-project later. for i, co in enumerate(cos_2d): self.uv[i][:] = ((co.x - xmin) / xspan, (co.y - ymin) / yspan) @@ -570,7 +570,7 @@ from bpy.props import BoolProperty, FloatProperty, IntProperty class LightMapPack(Operator): - """Pack each faces UV's into the UV bounds""" + """Pack each face's UVs into the UV bounds""" bl_idname = "uv.lightmap_pack" bl_label = "Lightmap Pack" diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index ffca4cff347..5190d09ccf8 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -807,9 +807,9 @@ struct Mesh *BKE_mesh_merge_verts(struct Mesh *mesh, int merge_mode); /** - * Account for custom-data such as UV's becoming detached because of imprecision + * Account for custom-data such as UVs becoming detached because of imprecision * in custom-data interpolation. - * Without running this operation subdivision surface can cause UV's to be disconnected, + * Without running this operation subdivision surface can cause UVs to be disconnected, * see: T81065. */ void BKE_mesh_merge_customdata_for_apply_modifier(struct Mesh *me); diff --git a/source/blender/blenkernel/BKE_pbvh_pixels.hh b/source/blender/blenkernel/BKE_pbvh_pixels.hh index 55ecf65bcac..a6b5bb565c5 100644 --- a/source/blender/blenkernel/BKE_pbvh_pixels.hh +++ b/source/blender/blenkernel/BKE_pbvh_pixels.hh @@ -59,7 +59,7 @@ struct UVPrimitivePaintInput { /** Corresponding index into PaintGeometryPrimitives */ int64_t geometry_primitive_index; /** - * Delta barycentric coordinates between 2 neighboring UV's in the U direction. + * Delta barycentric coordinates between 2 neighboring UVs in the U direction. * * Only the first two coordinates are stored. The third should be recalculated */ diff --git a/source/blender/blenkernel/intern/mesh.cc b/source/blender/blenkernel/intern/mesh.cc index d2e61d37e44..60547a57094 100644 --- a/source/blender/blenkernel/intern/mesh.cc +++ b/source/blender/blenkernel/intern/mesh.cc @@ -510,7 +510,7 @@ static bool is_uv_bool_sublayer(CustomDataLayer const *l) is_sublayer_name(UV_PINNED_NAME, name); } -/** Thresh is threshold for comparing vertices, UV's, vertex colors, weights, etc. */ +/** Thresh is threshold for comparing vertices, UVs, vertex colors, weights, etc. */ static int customdata_compare( CustomData *c1, CustomData *c2, const int total_length, Mesh *m1, Mesh *m2, const float thresh) { diff --git a/source/blender/blenkernel/intern/mesh_legacy_convert.cc b/source/blender/blenkernel/intern/mesh_legacy_convert.cc index 9fd9214f8af..868653013a6 100644 --- a/source/blender/blenkernel/intern/mesh_legacy_convert.cc +++ b/source/blender/blenkernel/intern/mesh_legacy_convert.cc @@ -524,7 +524,7 @@ static void convert_mfaces_to_mpolys(ID *id, } /* NOTE: we don't convert NGons at all, these are not even real ngons, - * they have their own UV's, colors etc - its more an editing feature. */ + * they have their own UVs, colors etc - it's more an editing feature. */ BLI_edgehash_free(eh, nullptr); diff --git a/source/blender/blenkernel/intern/mesh_mapping.cc b/source/blender/blenkernel/intern/mesh_mapping.cc index 9028f6d51b3..7ebf57ffd3c 100644 --- a/source/blender/blenkernel/intern/mesh_mapping.cc +++ b/source/blender/blenkernel/intern/mesh_mapping.cc @@ -4,7 +4,7 @@ * \ingroup bke * * Functions for accessing mesh connectivity data. - * eg: polys connected to verts, UV's connected to verts. + * eg: polys connected to verts, UVs connected to verts. */ #include "MEM_guardedalloc.h" diff --git a/source/blender/blenkernel/intern/mesh_merge_customdata.cc b/source/blender/blenkernel/intern/mesh_merge_customdata.cc index 7a0895c18e1..f219ad3ae19 100644 --- a/source/blender/blenkernel/intern/mesh_merge_customdata.cc +++ b/source/blender/blenkernel/intern/mesh_merge_customdata.cc @@ -38,11 +38,11 @@ static int compare_v2_classify(const float uv_a[2], const float uv_b[2]) * values as the absolute value doesn't account for float precision at difference scales. * - For subdivision-surface ULP of 3 is sufficient, * although this value is extremely small. - * - For bevel the ULP of 12 is sufficient to merge UV's that appear to be connected + * - For bevel the ULP of 12 is sufficient to merge UVs that appear to be connected * with bevel on Suzanne beveled 15% with 6 segments. * * These values could be tweaked but should be kept on the small side to prevent - * unintentional joining of intentionally dis-connected UV's. + * unintentional joining of intentionally disconnected UVs. * * Before v2.91 the threshold was either (`1e-4` or `0.05 / image_size` for selection picking). * So picking used a threshold of `1e-4` for a 500x500 image and `1e-5` for a 5000x5000 image. @@ -63,7 +63,7 @@ static void merge_uvs_for_vertex(const Span<int> loops_for_vert, Span<float2 *> if (loops_for_vert.size() <= 1) { return; } - /* Manipulate a copy of the loop indices, de-duplicating UV's per layer. */ + /* Manipulate a copy of the loop indices, de-duplicating UVs per layer. */ Vector<int, 32> loops_merge; loops_merge.reserve(loops_for_vert.size()); for (float2 *mloopuv : mloopuv_layers) { diff --git a/source/blender/blenlib/BLI_uvproject.h b/source/blender/blenlib/BLI_uvproject.h index a94fd796121..ecd3fa744db 100644 --- a/source/blender/blenlib/BLI_uvproject.h +++ b/source/blender/blenlib/BLI_uvproject.h @@ -40,7 +40,7 @@ void BLI_uvproject_from_view(float target[2], float winy); /** - * Apply orthographic UV's. + * Apply orthographic UVs. */ void BLI_uvproject_from_view_ortho(float target[2], float source[3], const float rotmat[4][4]); diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index 8cbc08357a4..980c8894e10 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -1791,7 +1791,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) /* MTexPoly now removed. */ if (DNA_struct_find(fd->filesdna, "MTexPoly")) { for (Mesh *me = bmain->meshes.first; me; me = me->id.next) { - /* If we have UV's, so this file will have MTexPoly layers too! */ + /* If we have UVs, so this file will have MTexPoly layers too! */ @@ 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