diff --git a/build_files/build_environment/install_linux_packages.py b/build_files/build_environment/install_linux_packages.py index d5cd0bc32cd..c596c20ad4a 100755 --- a/build_files/build_environment/install_linux_packages.py +++ b/build_files/build_environment/install_linux_packages.py @@ -1161,7 +1161,7 @@ class PackageInstaller: def package_find(self, package, package_distro_name): """ - Generic euristics to try and find 'best macthing version' for a given package. + 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, llvm or boost, can have packages available for several versions, diff --git a/intern/ghost/intern/GHOST_ContextVK.cc b/intern/ghost/intern/GHOST_ContextVK.cc index 21b4c625994..8630bf79568 100644 --- a/intern/ghost/intern/GHOST_ContextVK.cc +++ b/intern/ghost/intern/GHOST_ContextVK.cc @@ -991,7 +991,7 @@ GHOST_TSuccess GHOST_ContextVK::initializeDrawingContext() required_device_extensions.push_back(VK_KHR_SWAPCHAIN_EXTENSION_NAME); } required_device_extensions.push_back(VK_KHR_DYNAMIC_RENDERING_EXTENSION_NAME); - /* NOTE: marking this as an optional extension, but is actually required. Renderdoc doesn't + /* NOTE: marking this as an optional extension, but is actually required. RenderDoc doesn't * create a device with this extension, but seems to work when not requesting the extension. */ optional_device_extensions.push_back(VK_EXT_DYNAMIC_RENDERING_UNUSED_ATTACHMENTS_EXTENSION_NAME); diff --git a/source/blender/editors/include/ED_render.hh b/source/blender/editors/include/ED_render.hh index 9d4b3e6d642..b0c0d9d67b6 100644 --- a/source/blender/editors/include/ED_render.hh +++ b/source/blender/editors/include/ED_render.hh @@ -113,7 +113,7 @@ void ED_preview_draw( /** * For UI previews (i.e. #uiPreview, not #PreviewImage): Tag all previews for \a id as dirty, so - * the next redraw triggers a rerender in #ED_preview_draw(). + * the next redraw triggers a re-render in #ED_preview_draw(). */ void ED_previews_tag_dirty_by_id(const Main &bmain, const ID &id); diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.cc b/source/blender/editors/sculpt_paint/sculpt_undo.cc index 6ea52d9dd73..7bafbc3acc4 100644 --- a/source/blender/editors/sculpt_paint/sculpt_undo.cc +++ b/source/blender/editors/sculpt_paint/sculpt_undo.cc @@ -371,10 +371,10 @@ static void restore_position_mesh(const Depsgraph &depsgraph, Mesh &mesh = *static_cast(object.data); const SculptSession &ss = *object.sculpt; - /* Ideally, we would use the PositionDeformData#deform method to perform the reverse deformation - * based on the evaluated positions, hwoever this causes odd behavior. For now, this is a - * modified version of older code that depends on an extra `orig_position` array stored inside - * the `Node` to perform swaps correctly. + /* Ideally, we would use the #PositionDeformData::deform method to perform the reverse + * deformation based on the evaluated positions, however this causes odd behavior. + * For now, this is a modified version of older code that depends on an extra `orig_position` + * array stored inside the #Node to perform swaps correctly. * * See #128859 for more detail. */ diff --git a/source/blender/gpu/metal/mtl_shader.mm b/source/blender/gpu/metal/mtl_shader.mm index 6af06004876..bda02af2a43 100644 --- a/source/blender/gpu/metal/mtl_shader.mm +++ b/source/blender/gpu/metal/mtl_shader.mm @@ -121,7 +121,7 @@ MTLShader::~MTLShader() /* Free Metal resources. * This is done in the order of: - * 1. Pipelinestate objects + * 1. PipelineState objects * 2. MTLFunctions * 3. MTLLibraries * So that each object releases it's references to the one following it. */ diff --git a/source/blender/gpu/vulkan/vk_shader_compiler.cc b/source/blender/gpu/vulkan/vk_shader_compiler.cc index 41f9cd6572b..693ceb5b0f3 100644 --- a/source/blender/gpu/vulkan/vk_shader_compiler.cc +++ b/source/blender/gpu/vulkan/vk_shader_compiler.cc @@ -62,7 +62,7 @@ static std::optional cache_dir_get() static bool read_spirv_from_disk(VKShaderModule &shader_module) { if (G.debug & G_DEBUG_GPU_RENDERDOC) { - /* Renderdoc uses spirv shaders including debug information. */ + /* RenderDoc uses spirv shaders including debug information. */ return false; } std::optional cache_dir = cache_dir_get(); diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h index d84e0464a1f..457c83c8a51 100644 --- a/source/blender/makesdna/DNA_screen_types.h +++ b/source/blender/makesdna/DNA_screen_types.h @@ -343,7 +343,7 @@ typedef struct uiPreview { } uiPreview; typedef enum uiPreviewTag { - /** Preview needs rerendering, handled in #ED_preview_draw(). */ + /** Preview needs re-rendering, handled in #ED_preview_draw(). */ UI_PREVIEW_TAG_DIRTY = (1 << 0), } uiPreviewTag; diff --git a/source/blender/python/gpu/gpu_py_framebuffer.cc b/source/blender/python/gpu/gpu_py_framebuffer.cc index 9bef53654df..e0a3a3dc858 100644 --- a/source/blender/python/gpu/gpu_py_framebuffer.cc +++ b/source/blender/python/gpu/gpu_py_framebuffer.cc @@ -367,9 +367,8 @@ static PyObject *pygpu_framebuffer__tp_new(PyTypeObject * /*self*/, PyObject *ar if (PySequence_Check(color_attachements)) { color_attachements_len = PySequence_Size(color_attachements); if (color_attachements_len > BPYGPU_FB_MAX_COLOR_ATTACHMENT) { - PyErr_SetString( - PyExc_AttributeError, - "too many attachements, max is " STRINGIFY(BPYGPU_FB_MAX_COLOR_ATTACHMENT)); + PyErr_SetString(PyExc_AttributeError, + "too many attachments, max is " STRINGIFY(BPYGPU_FB_MAX_COLOR_ATTACHMENT)); return nullptr; } diff --git a/source/blender/python/mathutils/mathutils_bvhtree.cc b/source/blender/python/mathutils/mathutils_bvhtree.cc index 54806ee5707..0ed4112856c 100644 --- a/source/blender/python/mathutils/mathutils_bvhtree.cc +++ b/source/blender/python/mathutils/mathutils_bvhtree.cc @@ -643,7 +643,7 @@ PyDoc_STRVAR( "\n" " :arg vertices: float triplets each representing ``(x, y, z)``\n" " :type vertices: float triplet sequence\n" - " :arg polygons: Sequence of polyugons, each containing indices to the vertices argument.\n" + " :arg polygons: Sequence of polygons, each containing indices to the vertices argument.\n" " :type polygons: Sequence of sequences containing ints\n" " :arg all_triangles: Use when all **polygons** are triangles for more efficient " "conversion.\n" diff --git a/source/creator/creator_args.cc b/source/creator/creator_args.cc index 3af08c656fb..5bcebcdfa81 100644 --- a/source/creator/creator_args.cc +++ b/source/creator/creator_args.cc @@ -1436,7 +1436,7 @@ static int arg_handle_debug_gpu_scope_capture_set(int argc, const char **argv, v static const char arg_handle_debug_gpu_renderdoc_set_doc[] = "\n" - "\tEnable Renderdoc integration for GPU frame grabbing and debugging."; + "\tEnable RenderDoc integration for GPU frame grabbing and debugging."; static int arg_handle_debug_gpu_renderdoc_set(int /*argc*/, const char ** /*argv*/, void * /*data*/)