diff --git a/build_files/build_environment/install_linux_packages.py b/build_files/build_environment/install_linux_packages.py index ec347616985..44e5fecbea1 100755 --- a/build_files/build_environment/install_linux_packages.py +++ b/build_files/build_environment/install_linux_packages.py @@ -1101,10 +1101,10 @@ class PackageInstaller: Generic heuristics to try and find 'best matching version' for a given package. For most packages it just ensures given package name version matches the exact version from the ``package``, or at least fits within the [version_min, version_mex[ range. - But some, like e.g. python or llvm, can have packages available for several versions, - with complex naming (like 'python3.10', 'llvm-9-dev', etc.). + But some, like e.g. Python or LLVM, can have packages available for several versions, + with complex naming (like ``python3.10``, ``llvm-9-dev``, etc.). This code attempts to find the best matching one possible, based on a set of 'possible names' - generated by the distro-specific ``package_name_version_gen`` generator. + generated by the distribution-specific ``package_name_version_gen`` generator. """ # Check 'exact' version match on given name. if self.package_query_version_match(package_distro_name, package.version_short): diff --git a/intern/cycles/test/render_graph_finalize_test.cpp b/intern/cycles/test/render_graph_finalize_test.cpp index fa32c6f766c..e41bd4638ed 100644 --- a/intern/cycles/test/render_graph_finalize_test.cpp +++ b/intern/cycles/test/render_graph_finalize_test.cpp @@ -852,7 +852,7 @@ TEST_F(RenderGraph, constant_fold_separate_combine_hsv) CORRECT_INFO_MESSAGE(log, "Folding SeparateHSV::Blue to constant (0.7)."); CORRECT_INFO_MESSAGE(log, "Folding CombineHSV::Color to constant (0.3, 0.5, 0.7)."); - /* R, G, B corrispond to H, S, V on this node */ + /* R, G, B correspond to H, S, V on this node. */ builder .add_node(ShaderNodeBuilder(graph, "SeparateHSV") .set("Color", make_float3(0.3f, 0.5f, 0.7f)) diff --git a/release/release_notes/bug_fixes_per_major_release.py b/release/release_notes/bug_fixes_per_major_release.py index 490a4005eae..c368801ac5c 100644 --- a/release/release_notes/bug_fixes_per_major_release.py +++ b/release/release_notes/bug_fixes_per_major_release.py @@ -823,7 +823,7 @@ def print_release_notes(list_of_commits: list[CommitInfo]) -> None: print(r"""What to do with this output: - Go through every commit in the "Commits that need manual sorting" section and: - - Find the corrisponding issue that was fixed (it will be in the commit message) + - Find the corresponding issue that was fixed (it will be in the commit message) - Update the "Broken" and/or "Working" fields of the report with relevant information so this script can sort it. - Add a module label if it's missing one. - Rerun this script. diff --git a/source/blender/gpu/vulkan/vk_ghost_api.hh b/source/blender/gpu/vulkan/vk_ghost_api.hh index 5c71f3cb86d..2956896dad7 100644 --- a/source/blender/gpu/vulkan/vk_ghost_api.hh +++ b/source/blender/gpu/vulkan/vk_ghost_api.hh @@ -19,8 +19,8 @@ namespace blender::gpu { * identical between GPU module and GHOST, otherwise GHOST can still select a device which isn't * supported. * - * For example on a Linux machine where llvmpipe is installed and an not supported NVIDIA driver - * Blender would detect a supported configuration using llvmpipe, but GHOST could still select the + * For example on a Linux machine where LLVMPIPE is installed and an not supported NVIDIA driver + * Blender would detect a supported configuration using LLVMPIPE, but GHOST could still select the * unsupported NVIDIA driver. * * Returns true when supported, false when not supported. diff --git a/source/blender/makesrna/intern/rna_object_api.cc b/source/blender/makesrna/intern/rna_object_api.cc index da015ad1a0e..6944ad446d0 100644 --- a/source/blender/makesrna/intern/rna_object_api.cc +++ b/source/blender/makesrna/intern/rna_object_api.cc @@ -1093,7 +1093,7 @@ void RNA_api_object(StructRNA *srna) func = RNA_def_function(srna, "shape_key_add", "rna_Object_shape_key_add"); RNA_def_function_ui_description(func, "Add shape key to this object"); RNA_def_function_flag(func, FUNC_USE_CONTEXT | FUNC_USE_REPORTS); - RNA_def_string(func, "name", "Key", 0, "", "Unique name for the new keyblock"); /* optional */ + RNA_def_string(func, "name", "Key", 0, "", "Unique name for the new key-block"); /* optional */ RNA_def_boolean(func, "from_mix", true, "", "Create new shape from existing mix of shapes"); parm = RNA_def_pointer(func, "key", "ShapeKey", "", "New shape keyblock"); RNA_def_parameter_flags(parm, PropertyFlag(0), PARM_RNAPTR); diff --git a/source/blender/modifiers/intern/lineart/lineart_cpu.cc b/source/blender/modifiers/intern/lineart/lineart_cpu.cc index 4f134c6aa04..ec451b36e1e 100644 --- a/source/blender/modifiers/intern/lineart/lineart_cpu.cc +++ b/source/blender/modifiers/intern/lineart/lineart_cpu.cc @@ -2490,7 +2490,7 @@ static void lineart_object_load_single_instance(LineartData *ld, obi->obindex = obindex << LRT_OBINDEX_SHIFT; /* Prepare the matrix used for transforming this specific object (instance). This has to be - * done before mesh boundbox check because the function needs that. */ + * done before mesh bound-box check because the function needs that. */ mul_m4db_m4db_m4fl(obi->model_view_proj, ld->conf.view_projection, use_mat); mul_m4db_m4db_m4fl(obi->model_view, ld->conf.view, use_mat);