From 01806a62e34e83f97d3a39abe3b656e8f52257ba Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 7 Oct 2025 08:54:24 +1100 Subject: [PATCH] Cleanup: spelling (make check_spelling_*) --- doc/blender_file_format/BlendFileDnaExporter_25.py | 2 +- intern/cycles/CMakeLists.txt | 4 ++-- intern/cycles/device/metal/device_impl.mm | 2 +- scripts/modules/_bpy_internal/http/downloader.py | 6 +++--- source/blender/blenloader/intern/versioning_common.hh | 2 +- source/blender/blenloader/intern/writefile.cc | 6 +++--- source/blender/gpu/opengl/gl_storage_buffer.cc | 2 +- source/blender/python/intern/bpy_rna_id_collection.cc | 2 +- tools/check_source/check_spelling_config.py | 2 ++ 9 files changed, 15 insertions(+), 13 deletions(-) diff --git a/doc/blender_file_format/BlendFileDnaExporter_25.py b/doc/blender_file_format/BlendFileDnaExporter_25.py index daf52e85ec7..6ed645396b8 100755 --- a/doc/blender_file_format/BlendFileDnaExporter_25.py +++ b/doc/blender_file_format/BlendFileDnaExporter_25.py @@ -425,7 +425,7 @@ def main(): # deleting or not? if '--dna-keep-blend' in sys.argv: - # keep the blend, useful for studying hexdumps + # Keep the blend, useful for studying HEX-dumps. log.info("5: closing blend file:") log.info(" {0}".format(Path_Blend)) else: diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index 82a1c050982..e7b77090ca0 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -150,8 +150,8 @@ if(WIN32 AND MSVC AND NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") # such as in `svm.h`. # This flag is supported starting with MSVC 17.7 preview 3: # https://learn.microsoft.com/en-us/cpp/build/reference/jump-table-rdata - # This is an x64 specific optimisation. - if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.37.32820 + # This is an x64 specific optimization. + if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.37.32820 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64") string(APPEND CMAKE_CXX_FLAGS " /jumptablerdata") endif() diff --git a/intern/cycles/device/metal/device_impl.mm b/intern/cycles/device/metal/device_impl.mm index d8836cdd256..4c0928d4cd1 100644 --- a/intern/cycles/device/metal/device_impl.mm +++ b/intern/cycles/device/metal/device_impl.mm @@ -87,7 +87,7 @@ MetalDevice::MetalDevice(const DeviceInfo &info, Stats &stats, Profiler &profile mtlDevice = usable_devices[mtlDevId]; metal_printf("Creating new Cycles Metal device: %s", info.description.c_str()); - /* Ensure that back-compatability helpers for getting gpuAddress & gpuResourceID are set up. */ + /* Ensure that back-compatibility helpers for getting gpuAddress & gpuResourceID are set up. */ metal_gpu_address_helper_init(mtlDevice); /* Enable increased concurrent shader compiler limit. diff --git a/scripts/modules/_bpy_internal/http/downloader.py b/scripts/modules/_bpy_internal/http/downloader.py index cfc91532f0e..1ad781f93a5 100644 --- a/scripts/modules/_bpy_internal/http/downloader.py +++ b/scripts/modules/_bpy_internal/http/downloader.py @@ -121,7 +121,7 @@ class ConditionalDownloader: is renamed to the given path, overwriting any pre-existing file. Raises a HTTPRequestDownloadError for specific HTTP errors. Can also - raise other exceptions, for example when filesystem access fails. On any + raise other exceptions, for example when file-system access fails. On any exception, the `download_error()` function will be called on the reporter. """ @@ -1318,10 +1318,10 @@ def _cleanup_main_file_attribute() -> Generator[None]: See the `get_preparation_data(name)` function in Python's stdlib: https://github.com/python/cpython/blob/180b3eb697bf5bb0088f3f35ef2d3675f9fff04f/Lib/multiprocessing/spawn.py#L197 - This issue can be recognised by a failure to start a background process, + This issue can be recognized by a failure to start a background process, with an error like: - FileNotFoundError: [Errno 2] No such file or directory: '/path/to/blender/' + ``FileNotFoundError: [Errno 2] No such file or directory: '/path/to/blender/'`` """ diff --git a/source/blender/blenloader/intern/versioning_common.hh b/source/blender/blenloader/intern/versioning_common.hh index bda32c1bbc3..0f83f2e48f3 100644 --- a/source/blender/blenloader/intern/versioning_common.hh +++ b/source/blender/blenloader/intern/versioning_common.hh @@ -264,7 +264,7 @@ static void adjust_fcurve_key_frame_values(FCurve *fcurve, BKE_fcurve_handles_recalc(fcurve); } -/* Gets the compositing node tree of the given scene. The deprecated nodetree member is returned +/* Gets the compositing node tree of the given scene. The deprecated node-tree member is returned * for older versions before reusable node trees were introduced in bd61e69be5, while the new * compositing_node_group is returned otherwise. */ bNodeTree *version_get_scene_compositor_node_tree(Main *bmain, Scene *scene); diff --git a/source/blender/blenloader/intern/writefile.cc b/source/blender/blenloader/intern/writefile.cc index a89776a8873..08efd66b01b 100644 --- a/source/blender/blenloader/intern/writefile.cc +++ b/source/blender/blenloader/intern/writefile.cc @@ -687,7 +687,7 @@ static bool mywrite_end(WriteData *wd) static uint64_t get_stable_pointer_hint_for_id(const ID &id) { - /* Make the stable pointer dependend on the data-block name. This is somewhat arbitrary but the + /* Make the stable pointer dependent on the data-block name. This is somewhat arbitrary but the * name is at least something that doesn't really change automatically unexpectedly. */ const uint64_t name_hash = XXH3_64bits(id.name, strlen(id.name)); if (id.lib) { @@ -710,9 +710,9 @@ static void mywrite_id_begin(WriteData *wd, ID *id) BLI_assert(wd->validation_data.per_id_addresses_set.is_empty()); BLI_assert_msg(ID_IS_PACKED(id) || id->deep_hash.is_null(), - "The only IDs with non-null deephash data should be packed linked ones"); + "The only IDs with non-null deep-hash data should be packed linked ones"); BLI_assert_msg((id->flag & ID_FLAG_EMBEDDED_DATA) == 0 || id->deep_hash.is_null(), - "Embedded IDs should always have a null deephash data"); + "Embedded IDs should always have a null deep-hash data"); wd->stable_address_ids.next_id_hint = get_stable_pointer_hint_for_id(*id); diff --git a/source/blender/gpu/opengl/gl_storage_buffer.cc b/source/blender/gpu/opengl/gl_storage_buffer.cc index 50bb83f579b..e336fc04011 100644 --- a/source/blender/gpu/opengl/gl_storage_buffer.cc +++ b/source/blender/gpu/opengl/gl_storage_buffer.cc @@ -123,7 +123,7 @@ void GLStorageBuf::bind(int slot) void GLStorageBuf::bind_as(GLenum target) { BLI_assert_msg(ssbo_id_ != 0, - "Trying to use storage buf as indirect buffer but buffer was never filled."); + "Trying to use storage buffer as indirect buffer but buffer was never filled."); glBindBuffer(target, ssbo_id_); } diff --git a/source/blender/python/intern/bpy_rna_id_collection.cc b/source/blender/python/intern/bpy_rna_id_collection.cc index b138f6d6438..993ca5c85a8 100644 --- a/source/blender/python/intern/bpy_rna_id_collection.cc +++ b/source/blender/python/intern/bpy_rna_id_collection.cc @@ -559,7 +559,7 @@ const EnumPropertyItem rna_enum_file_path_foreach_flag_items[] = { {BKE_BPATH_FOREACH_PATH_SKIP_MULTIFILE, "SKIP_MULTIFILE", 0, - "Skip Multifile", + "Skip Multi-file", "Skip paths where a single dir is used with an array of files, eg. sequence strip images or " "point-caches. In this case only the first file path is processed. This is needed for " "directory manipulation callbacks which might otherwise modify the same directory multiple " diff --git a/tools/check_source/check_spelling_config.py b/tools/check_source/check_spelling_config.py index 3baaa3a11d1..b10bce92926 100644 --- a/tools/check_source/check_spelling_config.py +++ b/tools/check_source/check_spelling_config.py @@ -158,6 +158,7 @@ dict_custom = { "discretizes", "distributable", "downcasting", + "downloader", "downsample", "downsampled", "downsampler", @@ -308,6 +309,7 @@ dict_custom = { "prepend", "prepending", "preprocess", + "preprocesses", "preprocessing", "preprocessor", "preprocessors",