diff --git a/CMakeLists.txt b/CMakeLists.txt index 52466305d89..9a9976c3b2f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1590,7 +1590,7 @@ endif() # set the endian define if(MSVC) - # for some reason this fails on msvc + # For some reason this fails on MSVC. add_definitions(-D__LITTLE_ENDIAN__) # OSX-Note: as we do cross-compiling with specific set architecture, @@ -2429,7 +2429,7 @@ elseif(CMAKE_C_COMPILER_ID STREQUAL "Intel") string(APPEND C_WARNINGS " -wd188,186,144,913,556,858,597,177,1292,167,279,592,94,2722,3199") string(APPEND CXX_WARNINGS " -wd188,186,144,913,556,858,597,177,1292,167,279,592,94,2722,3199") elseif(CMAKE_C_COMPILER_ID STREQUAL "MSVC") - # most msvc warnings are C & C++ + # Most MSVC warnings are C & C++. set(_WARNINGS # warning level: "/W3" diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index b5fd66aea9e..1d4eb6e2a7a 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -550,7 +550,7 @@ macro(TEST_SSE_SUPPORT if(CMAKE_COMPILER_IS_GNUCC OR (CMAKE_C_COMPILER_ID MATCHES "Clang")) set(${_sse42_flags} "-march=x86-64-v2") elseif(MSVC) - # msvc has no specific build flags for SSE42, but when using intrinsics it will + # MSVC has no specific build flags for SSE42, but when using intrinsics it will # generate the right instructions. set(${_sse42_flags} "") elseif(CMAKE_C_COMPILER_ID STREQUAL "Intel") diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index 149fd793faf..035ed6e83ff 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -213,7 +213,7 @@ if(WITH_COMPILER_ASAN AND MSVC AND NOT MSVC_CLANG) endif() -# C++ standards conformace +# C++ standards conformance # /permissive- : Available from MSVC 15.5 (1912) and up. Enables standards-confirming compiler # behavior. Required until the project is marked as c++20. # /Zc:__cplusplus : Available from MSVC 15.7 (1914) and up. Ensures correct value of the __cplusplus @@ -403,7 +403,7 @@ set(ZLIB_INCLUDE_DIR ${LIBDIR}/zlib/include) set(ZLIB_LIBRARY ${LIBDIR}/zlib/lib/libz_st.lib) set(ZLIB_DIR ${LIBDIR}/zlib) -windows_find_package(ZLIB) # we want to find before finding things that depend on it like png +windows_find_package(ZLIB) # We want to find before finding things that depend on it like PNG. windows_find_package(PNG) if(NOT PNG_FOUND) warn_hardcoded_paths(libpng) @@ -1351,8 +1351,8 @@ if(WITH_CYCLES AND (WITH_CYCLES_DEVICE_ONEAPI OR (WITH_CYCLES_EMBREE AND EMBREE_ ) endif() -# Add the msvc directory to the path so when building with ASAN enabled tools such as -# msgfmt which run before the install phase can find the asan shared libraries. +# Add the MSVC directory to the path so when building with ASAN enabled tools such as +# `msgfmt` which run before the install phase can find the asan shared libraries. get_filename_component(_msvc_path ${CMAKE_C_COMPILER} DIRECTORY) # Environment variables to run precompiled executables that needed libraries. list(JOIN PLATFORM_BUNDLED_LIBRARY_DIRS ";" _library_paths) diff --git a/doc/blender_file_format/BlendFileDnaExporter_25.py b/doc/blender_file_format/BlendFileDnaExporter_25.py index 207dac24b4b..d508091162b 100755 --- a/doc/blender_file_format/BlendFileDnaExporter_25.py +++ b/doc/blender_file_format/BlendFileDnaExporter_25.py @@ -261,8 +261,8 @@ class DNACatalogHTML: def WriteToCSS(self, handle): ''' - Write the Cascading stylesheet template to the handle - It is expected that the handle is a Filehandle + Write the Cascading style-sheet template to the handle + It is expected that the handle is a File-handle. ''' css = """ @CHARSET "ISO-8859-1"; diff --git a/intern/cycles/scene/scene.cpp b/intern/cycles/scene/scene.cpp index c03925167af..21ce32b92fa 100644 --- a/intern/cycles/scene/scene.cpp +++ b/intern/cycles/scene/scene.cpp @@ -302,7 +302,7 @@ void Scene::device_update(Device *device_, Progress &progress) } /* Images last, as they should be more likely to use host memory fallback than geometry. - * Some images may have been uploaded early for displacemnet already at this point. */ + * Some images may have been uploaded early for displacement already at this point. */ progress.set_status("Updating Images"); image_manager->device_update(device, this, progress); @@ -346,7 +346,7 @@ void Scene::device_update(Device *device_, Progress &progress) return; } - /* Update lookup tabes a second time for film tables. */ + /* Update lookup tables a second time for film tables. */ progress.set_status("Updating Lookup Tables"); lookup_tables->device_update(device, &dscene, this); diff --git a/intern/cycles/session/session.cpp b/intern/cycles/session/session.cpp index 5eeb6121795..c4e1f4953af 100644 --- a/intern/cycles/session/session.cpp +++ b/intern/cycles/session/session.cpp @@ -311,7 +311,7 @@ RenderWork Session::run_update_for_next_iteration() /* Update scene */ const bool reset_scene = update_scene(delayed_reset_.do_reset); - /* Update buffers for new paramters. After scene update which influences the passes used. */ + /* Update buffers for new parameters. After scene update which influences the passes used. */ bool have_tiles = true; bool switched_to_new_tile = false; diff --git a/intern/ghost/intern/GHOST_XrGraphicsBindingD3D.cc b/intern/ghost/intern/GHOST_XrGraphicsBindingD3D.cc index c2b12769995..f1512c49c69 100644 --- a/intern/ghost/intern/GHOST_XrGraphicsBindingD3D.cc +++ b/intern/ghost/intern/GHOST_XrGraphicsBindingD3D.cc @@ -320,7 +320,7 @@ void GHOST_XrGraphicsBindingVulkanD3D::submitToSwapchainImage( ID3D11Texture2D *texture = nullptr; d3d_device->CreateTexture2D(&desc, &data, &texture); - /* Copy subresource of the uploaded texture to the swapchain texture. */ + /* Copy sub-resource of the uploaded texture to the swap-chain texture. */ d3d_device_ctx->CopySubresourceRegion( d3d_swapchain_image.texture, 0, draw_info.ofsx, draw_info.ofsy, 0, texture, 0, nullptr); diff --git a/release/release_notes/bug_fixes_per_major_release.py b/release/release_notes/bug_fixes_per_major_release.py index 4c618fe2d22..39e390188ec 100644 --- a/release/release_notes/bug_fixes_per_major_release.py +++ b/release/release_notes/bug_fixes_per_major_release.py @@ -312,9 +312,9 @@ class CommitInfo: command = ['git', 'show', '-s', '--format=%B', self.hash] command_output = subprocess.run(command, capture_output=True).stdout.decode('utf-8') - # Find every instance of SPACE#NUMBER. These are the report that the commit claims to fix. - # We are looking for the SPACE part because otherwise commits that fix issues in other repos, - # E.g. Fix blender/blender-maunal#NUMBER, will be picked out for processing. + # Find every instance of `SPACE#NUMBER`. These are the report that the commit claims to fix. + # We are looking for the `SPACE` part because otherwise commits that fix issues in other repositories, + # E.g. Fix `blender/blender-manual#NUMBER`, will be picked out for processing. match = re.findall(r'\s#+(\d+)', command_output) if match: self.fixed_reports = match diff --git a/source/blender/blenkernel/intern/curve_poly.cc b/source/blender/blenkernel/intern/curve_poly.cc index 0d4039de514..473c43250db 100644 --- a/source/blender/blenkernel/intern/curve_poly.cc +++ b/source/blender/blenkernel/intern/curve_poly.cc @@ -25,7 +25,7 @@ static bool delta_dir(const float3 &pos, const float3 &next, float3 &r_delta_dir /** * Computes an approximate tangent from the normalized sum from - * the direction vectors to neighbouring points on the curve. + * the direction vectors to neighboring points on the curve. */ static float3 direction_bisect(const float3 &pos, const float3 &next, diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc index 72c0fbbf06d..c953719c26c 100644 --- a/source/blender/depsgraph/intern/depsgraph.cc +++ b/source/blender/depsgraph/intern/depsgraph.cc @@ -190,7 +190,7 @@ Relation *Depsgraph::add_new_relation(Node *from, Node *to, const char *descript } #endif - /* Create new relation, and add it to the graph. The type must be trivially destructable for + /* Create new relation, and add it to the graph. The type must be trivially destructible for * `.release()` to be okay. If it weren't, we could store the relations with #destruct_ptr on * either the `inlinks` or `outlinks`. But since so many #Relation structs are allocated, it's * probably better for it be a simple type anyway. */ diff --git a/source/blender/editors/asset/ED_asset_list.hh b/source/blender/editors/asset/ED_asset_list.hh index dd70fa9da64..e1f6edaf32e 100644 --- a/source/blender/editors/asset/ED_asset_list.hh +++ b/source/blender/editors/asset/ED_asset_list.hh @@ -69,7 +69,7 @@ void storage_fetch(const AssetLibraryReference *library_reference, const bContex /** * Invoke asset list reading, guaranteed to execute on the same thread. * - * \see #storage_fetch for an async version. + * \see #storage_fetch for an asynchronous version. */ void storage_fetch_blocking(const AssetLibraryReference &library_reference, const bContext &C); bool is_loaded(const AssetLibraryReference *library_reference); diff --git a/source/blender/editors/sculpt_paint/brush_asset_ops.cc b/source/blender/editors/sculpt_paint/brush_asset_ops.cc index e1b839b339c..23cb40a5187 100644 --- a/source/blender/editors/sculpt_paint/brush_asset_ops.cc +++ b/source/blender/editors/sculpt_paint/brush_asset_ops.cc @@ -60,7 +60,7 @@ static wmOperatorStatus brush_asset_activate_exec(bContext *C, wmOperator *op) /* As asset loading can take upwards of a few minutes on production libraries, we typically * do not want this to execute in a blocking fashion. However, for testing / profiling * purposes, this is an acceptable workaround for now until a proper python API is created - * for this usecase. */ + * for this use case. */ asset::list::storage_fetch_blocking(asset_system::all_library_reference(), *C); } const asset_system::AssetRepresentation *asset = diff --git a/source/blender/editors/sculpt_paint/brushes/brushes.hh b/source/blender/editors/sculpt_paint/brushes/brushes.hh index 459cf9a4613..4d7986cb105 100644 --- a/source/blender/editors/sculpt_paint/brushes/brushes.hh +++ b/source/blender/editors/sculpt_paint/brushes/brushes.hh @@ -20,7 +20,7 @@ class Node; namespace blender::ed::sculpt_paint { -/** Represents the result of one or more bvh queries to find a brush's affected nodes. */ +/** Represents the result of one or more BVH queries to find a brush's affected nodes. */ struct NodeMaskResult { IndexMask node_mask; diff --git a/source/blender/python/intern/bpy_rna.cc b/source/blender/python/intern/bpy_rna.cc index ec0dc77be44..737a79b348f 100644 --- a/source/blender/python/intern/bpy_rna.cc +++ b/source/blender/python/intern/bpy_rna.cc @@ -599,7 +599,7 @@ static Mathutils_Callback mathutils_rna_array_cb = { (BaseMathSetIndexFunc)mathutils_rna_vector_set_index, }; -/* bpyrna matrix callbacks */ +/* BPY/RNA matrix callbacks. */ static uchar mathutils_rna_matrix_cb_index = -1; /* Index for our callbacks. */ static int mathutils_rna_matrix_get(BaseMathObject *bmo, int /*subtype*/)