From 6a1fa176ef59a2670a8a6d40f3ee76cc92b88ec1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 4 Jun 2025 01:51:29 +0000 Subject: [PATCH] Cleanup: spelling in comments & duplicate terms (check_spelling.py) Also minor clarification in doc-string. --- build_files/build_environment/cmake/python.cmake | 4 ++-- build_files/build_environment/cmake/setup_msys2.cmake | 2 +- build_files/build_environment/cmake/versions.cmake | 4 ++-- build_files/build_environment/windows/vmprep.cmd.txt | 8 ++++---- build_files/cmake/platform/platform_win32.cmake | 2 +- build_files/utils/make_bpy_wheel.py | 2 +- build_files/utils/make_update.py | 2 +- build_files/utils/make_utils.py | 5 +++-- doc/python_api/rst_from_bmesh_opdefines.py | 2 +- intern/cycles/kernel/osl/closures.cpp | 2 +- intern/ghost/intern/GHOST_ContextVK.cc | 2 +- intern/opensubdiv/opensubdiv_converter_capi.hh | 4 ++-- scripts/startup/bl_operators/uvcalc_lightmap.py | 2 +- source/blender/blenkernel/intern/path_templates.cc | 2 +- source/blender/blenlib/intern/array_store_rle.cc | 2 +- source/blender/editors/curve/editfont.cc | 6 +++--- source/blender/editors/include/ED_object.hh | 2 +- source/blender/editors/space_node/node_group.cc | 2 +- source/blender/gpu/vulkan/vk_backend.cc | 2 +- source/blender/makesdna/DNA_view3d_types.h | 2 +- 20 files changed, 30 insertions(+), 29 deletions(-) diff --git a/build_files/build_environment/cmake/python.cmake b/build_files/build_environment/cmake/python.cmake index 0b4f03fcd6f..16f13467467 100644 --- a/build_files/build_environment/cmake/python.cmake +++ b/build_files/build_environment/cmake/python.cmake @@ -140,8 +140,8 @@ else() export ZLIB_LIBS=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY} ) - # This patch indludes changes to fix missing -lm for sqlite and and fix the order of - # -ldl flags for ssl to avoid link errors. + # This patch includes changes to fix missing `-lm` for SQLITE + # and fix the order of `-ldl` flags for SSL to avoid link errors. if(APPLE) set(PYTHON_PATCH ${PATCH_CMD} --verbose -p1 -d diff --git a/build_files/build_environment/cmake/setup_msys2.cmake b/build_files/build_environment/cmake/setup_msys2.cmake index cf3c4068f88..75ec77aa4f5 100644 --- a/build_files/build_environment/cmake/setup_msys2.cmake +++ b/build_files/build_environment/cmake/setup_msys2.cmake @@ -113,7 +113,7 @@ if((NOT EXISTS "${DOWNLOAD_DIR}/msys2/msys64/msys2_shell.cmd") AND ) # Do initial upgrade of pacman packages (only required for initial setup, to get - # latest packages as opposed to to what the installer comes with) + # latest packages as opposed to what the installer comes with). execute_process( COMMAND ${DOWNLOAD_DIR}/msys2/msys64/msys2_shell.cmd -defterm -no-start -clang64 -c "pacman -Sy --noconfirm && exit" diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index 58ff1fbb0da..7ec6a8b4821 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -1178,7 +1178,7 @@ set(IGC_LLVM_HOMEPAGE https://github.com/llvm/llvm-project/) set(IGC_LLVM_LICENSE SPDX:Apache-2.0 WITH LLVM-exception) set(IGC_LLVM_COPYRIGHT "Copyright (c) 2003-2019 University of Illinois at Urbana-Champaign. All rights reserved.") -# WARNING WARNING WARNING +# ******* WARNING ******* # # IGC_OPENCL_CLANG contains patches for some of its dependencies. # @@ -1186,7 +1186,7 @@ set(IGC_LLVM_COPYRIGHT "Copyright (c) 2003-2019 University of Illinois at Urbana # IGC_OPENCL_CLANG's patches folder and update igc.cmake to account for # any added or removed patches. # -# WARNING WARNING WARNING +# ******* WARNING ******* set(IGC_OPENCL_CLANG_VERSION v14.0.1) set(IGC_OPENCL_CLANG_URI https://github.com/intel/opencl-clang/archive/${IGC_OPENCL_CLANG_VERSION}.tar.gz) diff --git a/build_files/build_environment/windows/vmprep.cmd.txt b/build_files/build_environment/windows/vmprep.cmd.txt index da78bfbdf5d..b95a43bffe9 100644 --- a/build_files/build_environment/windows/vmprep.cmd.txt +++ b/build_files/build_environment/windows/vmprep.cmd.txt @@ -46,14 +46,14 @@ echo # echo # Since this will download and install a whole bunch of stuff the following echo # disclamer is seemingly required: echo # -echo # *WARNING WARNING WARNING* -echo # *WARNING WARNING WARNING* +echo # ******* WARNING ******* +echo # ******* WARNING ******* echo # echo # DO NOT RUN THIS ON ANYTHING BUT A CLEAN WINDOWS INSTALL, IF YOU DO, AND IT echo # MESSES UP YOUR WORKSTATION, THATS ON YOU... echo # -echo # *WARNING WARNING WARNING* -echo # *WARNING WARNING WARNING* +echo # ******* WARNING ******* +echo # ******* WARNING ******* echo # echo # hit ctrl-break right now to abort.. last chance echo # diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index 9c41abafc45..ae75fcd2d0a 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -226,7 +226,7 @@ if(NOT MSVC_CLANG) string(APPEND CMAKE_CXX_FLAGS " /permissive- /Zc:__cplusplus /Zc:inline") string(APPEND CMAKE_C_FLAGS " /Zc:inline") - # For VS2022+ we can enable the the new preprocessor + # For VS2022+ we can enable the new preprocessor if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.30.30423) string(APPEND CMAKE_CXX_FLAGS " /Zc:preprocessor") string(APPEND CMAKE_C_FLAGS " /Zc:preprocessor") diff --git a/build_files/utils/make_bpy_wheel.py b/build_files/utils/make_bpy_wheel.py index 882f8ce6e00..39f6bb90d19 100755 --- a/build_files/utils/make_bpy_wheel.py +++ b/build_files/utils/make_bpy_wheel.py @@ -201,7 +201,7 @@ def main() -> None: platform_tag = "macosx_%d_%d_%s" % (target_major, target_minor, machine) elif sys.platform == "win32": # Workaround for Python process running in a virtualized environment on Windows-on-Arm: - # use the actual processor architecture instead of the the virtualized one. + # use the actual processor architecture instead of the virtualized one. # # The win_arm64 matches the behavior when native WoA Python is used, and also matches # sysconfig.get_platform() from a native Python build (although it returns win-arm64 with a diff --git a/build_files/utils/make_update.py b/build_files/utils/make_update.py index 8ac6daeb0be..bf15f5f3385 100755 --- a/build_files/utils/make_update.py +++ b/build_files/utils/make_update.py @@ -47,7 +47,7 @@ def print_stage(text: str) -> None: def parse_arguments() -> argparse.Namespace: """ - Parse command line line arguments. + Parse command line arguments. Returns parsed object from which the command line arguments can be accessed as properties. The name of the properties matches the command line argument, diff --git a/build_files/utils/make_utils.py b/build_files/utils/make_utils.py index 56754483c74..c70022083a6 100755 --- a/build_files/utils/make_utils.py +++ b/build_files/utils/make_utils.py @@ -209,14 +209,15 @@ def is_git_submodule_enabled(git_command: str, submodule_dir: Path) -> bool: if not path: return False - # When the "update" strategy is not provided explicitly in the the local configuration + # When the "update" strategy is not provided explicitly in the local configuration # `git config` returns a non-zero exit code. For those assume the default "checkout" # strategy. update = check_output( (git_command, "config", "--local", _git_submodule_config_key(submodule_dir, "update")), exit_on_error=False) if update == "": - # The repo is not in our local config. Check the default .gitmodules setting. + # The repository is not in our local configuration. + # Check the default `.gitmodules` setting. update = check_output( (git_command, "config", "--file", str(gitmodules), _git_submodule_config_key(submodule_dir, "update")), exit_on_error=False) diff --git a/doc/python_api/rst_from_bmesh_opdefines.py b/doc/python_api/rst_from_bmesh_opdefines.py index 12fbaf439e8..bd06ae09ca3 100644 --- a/doc/python_api/rst_from_bmesh_opdefines.py +++ b/doc/python_api/rst_from_bmesh_opdefines.py @@ -318,7 +318,7 @@ def main(): tp_str = ":class:`bpy.types.Mesh`" elif tp_sub == BMO_OP_SLOT_SUBTYPE_PTR_STRUCT: # XXX Used for CurveProfile only currently I think (bevel code), - # but think the idea is that that pointer is for any type? + # but think the idea is that pointer is for any type? tp_str = ":class:`bpy.types.bpy_struct`" else: assert False, "unreachable, unknown type {!r}".format(vars_dict_reverse[tp_sub]) diff --git a/intern/cycles/kernel/osl/closures.cpp b/intern/cycles/kernel/osl/closures.cpp index ae2d082bbec..8a6d9bd0ce4 100644 --- a/intern/cycles/kernel/osl/closures.cpp +++ b/intern/cycles/kernel/osl/closures.cpp @@ -298,7 +298,7 @@ packed_float3 osl_eval_camera(const ThreadKernelGlobalsCPU *kg, return zero_spectrum(); } - /* Setup shader globals from from the sensor position. */ + /* Setup shader globals from the sensor position. */ cameradata_to_shaderglobals(sensor, dSdx, dSdy, rand_lens, &kg->osl.shader_globals); /* Clear trace data. */ diff --git a/intern/ghost/intern/GHOST_ContextVK.cc b/intern/ghost/intern/GHOST_ContextVK.cc index 042ab0f620e..c9ad3bf173f 100644 --- a/intern/ghost/intern/GHOST_ContextVK.cc +++ b/intern/ghost/intern/GHOST_ContextVK.cc @@ -116,7 +116,7 @@ static bool contains_extension(const vector &extension_li }; /* -------------------------------------------------------------------- */ -/** \name Swapchain resources +/** \name Swap-chain resources * \{ */ void GHOST_SwapchainImage::destroy(VkDevice vk_device) diff --git a/intern/opensubdiv/opensubdiv_converter_capi.hh b/intern/opensubdiv/opensubdiv_converter_capi.hh index c0080e766fd..bbfa9121338 100644 --- a/intern/opensubdiv/opensubdiv_converter_capi.hh +++ b/intern/opensubdiv/opensubdiv_converter_capi.hh @@ -75,13 +75,13 @@ struct OpenSubdiv_Converter { // Number of edges which are adjacent to the given vertex. int (*getNumVertexEdges)(const OpenSubdiv_Converter *converter, const int vertex_index); - // Array fo edge indices which are adjacent to the given vertex. + // Array for edge indices which are adjacent to the given vertex. void (*getVertexEdges)(const OpenSubdiv_Converter *converter, const int vertex_index, int *vertex_edges); // Number of faces which are adjacent to the given vertex. int (*getNumVertexFaces)(const OpenSubdiv_Converter *converter, const int vertex_index); - // Array fo face indices which are adjacent to the given vertex. + // Array for face indices which are adjacent to the given vertex. void (*getVertexFaces)(const OpenSubdiv_Converter *converter, const int vertex_index, int *vertex_faces); diff --git a/scripts/startup/bl_operators/uvcalc_lightmap.py b/scripts/startup/bl_operators/uvcalc_lightmap.py index e6f46cc7a09..ff036d272de 100644 --- a/scripts/startup/bl_operators/uvcalc_lightmap.py +++ b/scripts/startup/bl_operators/uvcalc_lightmap.py @@ -598,7 +598,7 @@ class LightMapPack(Operator): # Proper solution would be to make undo stack aware of such things, # but for now just disable redo. Keep undo here so unwanted changes to uv # coords might be undone. - # This fixes infinite image creation reported there #30968 (sergey) + # NOTE(@sergey): This fixes infinite image creation reported there #30968. bl_options = {'UNDO'} PREF_CONTEXT: bpy.props.EnumProperty( diff --git a/source/blender/blenkernel/intern/path_templates.cc b/source/blender/blenkernel/intern/path_templates.cc index a7b531aebaf..104cd876c15 100644 --- a/source/blender/blenkernel/intern/path_templates.cc +++ b/source/blender/blenkernel/intern/path_templates.cc @@ -278,7 +278,7 @@ struct Token { * the path string. */ blender::IndexRange byte_range; - /* Reference to the the variable name as written in the template string. Note + /* Reference to the variable name as written in the template string. Note * that this points into the template string, and does not own the value. * * Only relevant when `type == VARIABLE_EXPRESSION`. */ diff --git a/source/blender/blenlib/intern/array_store_rle.cc b/source/blender/blenlib/intern/array_store_rle.cc index 7c9b2c846fb..2ecf27e46a2 100644 --- a/source/blender/blenlib/intern/array_store_rle.cc +++ b/source/blender/blenlib/intern/array_store_rle.cc @@ -12,7 +12,7 @@ * (which doesn't de-duplicate so well). * * Intended for byte arrays as there is no special logic to handle alignment. - * Note that this this could be supported and would be useful to de-duplicate + * Note that this could be supported and would be useful to de-duplicate * repeating patterns of non-byte data. * * Notes: diff --git a/source/blender/editors/curve/editfont.cc b/source/blender/editors/curve/editfont.cc index cc568d4c765..d8a4f489cfe 100644 --- a/source/blender/editors/curve/editfont.cc +++ b/source/blender/editors/curve/editfont.cc @@ -409,13 +409,13 @@ static void text_update_edited(bContext *C, Object *obedit, const eEditFontMode BLI_assert(ef->len >= 0); - /* run update first since it can move the cursor */ + /* Run update first since it can move the cursor. */ if (mode == FO_EDIT) { - /* re-tesselllate */ + /* Re-tessellate. */ DEG_id_tag_update(static_cast(obedit->data), 0); } else { - /* depsgraph runs above, but since we're not tagging for update, call direct */ + /* Depsgraph runs above, but since we're not tagging for update, call directly. */ /* We need evaluated data here. */ Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C); BKE_vfont_to_curve(DEG_get_evaluated(depsgraph, obedit), mode); diff --git a/source/blender/editors/include/ED_object.hh b/source/blender/editors/include/ED_object.hh index a2731133569..dbd9700cacf 100644 --- a/source/blender/editors/include/ED_object.hh +++ b/source/blender/editors/include/ED_object.hh @@ -71,7 +71,7 @@ blender::Vector objects_in_mode_or_selected( * Set the active material by index. * * \param index: A zero based index. This will be clamped to the valid range. - * \return true if the material changed. + * \return true if the material index changed. */ bool material_active_index_set(Object *ob, int index); diff --git a/source/blender/editors/space_node/node_group.cc b/source/blender/editors/space_node/node_group.cc index 5335d062d48..ddfc062c232 100644 --- a/source/blender/editors/space_node/node_group.cc +++ b/source/blender/editors/space_node/node_group.cc @@ -1383,7 +1383,7 @@ static bNode *node_group_make_from_node_declaration(bContext &C, gnode->id = &wrapper_group->id; id_us_plus(gnode->id); - /* Position node node exactly where the old node was. */ + /* Position node exactly where the old node was. */ gnode->parent = src_node.parent; gnode->width = src_node.width; copy_v2_v2(gnode->location, src_node.location); diff --git a/source/blender/gpu/vulkan/vk_backend.cc b/source/blender/gpu/vulkan/vk_backend.cc index 9db4f07b8f2..c0c49da88db 100644 --- a/source/blender/gpu/vulkan/vk_backend.cc +++ b/source/blender/gpu/vulkan/vk_backend.cc @@ -171,7 +171,7 @@ bool VKBackend::is_supported() * Disable implicit layers and only allow layers that we trust. * * Render doc layer is hidden behind a debug flag. There are malicious layers that impersonate - * renderdoc and can crash when loaded. See #139543 + * RenderDoc and can crash when loaded. See #139543 */ std::stringstream allowed_layers; allowed_layers << "VK_LAYER_KHRONOS_*"; diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index eac1e4f9958..3bb9396d9f6 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -125,7 +125,7 @@ typedef struct RegionView3D { char ndof_flag; /** - * Rotation center used for for "Auto Orbit" (see #NDOF_ORBIT_CENTER_AUTO). + * Rotation center used for "Auto Orbit" (see #NDOF_ORBIT_CENTER_AUTO). * Any modification should be followed by adjusting #RegionView3D::dist * to prevent problems zooming in after navigation. See: #134732. */