Merge branch 'blender-v4.3-release'

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,

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);

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);
 

source/blender/editors/sculpt_paint/sculpt_undo.cc

@@ -371,10 +371,10 @@ static void restore_position_mesh(const Depsgraph &depsgraph,
   Mesh &mesh = *static_cast<Mesh *>(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.
    */

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. */

source/blender/gpu/vulkan/vk_shader_compiler.cc

@@ -62,7 +62,7 @@ static std::optional<std::string> 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<std::string> cache_dir = cache_dir_get();

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;
 

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;
       }
 

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"

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*/)