Merge branch 'blender-v4.2-release'

source/blender/draw/engines/eevee_next/shaders/eevee_shadow_page_mask_comp.glsl

@@ -178,7 +178,7 @@ void main()
       /* WATCH: To be kept in sync with `max_view_per_tilemap()` function. */
       bool is_render = max_view_per_tilemap == SHADOW_TILEMAP_LOD;
       /* Tag base page to be rendered if any other tile is needed by this shadow.
-       * Fixes issue with shadow map ray tracing sampling invalide tiles.
+       * Fixes issue with shadow map ray tracing sampling invalid tiles.
        * Only do this in for final render or if all the main levels were already rendered.
        * This last heuristic avoids very low quality shadows during viewport animation, transform
        * or jittered shadows. */

source/blender/gpu/GPU_material.hh

@@ -275,7 +275,7 @@ BatchHandle GPU_material_batch_compile(blender::Span<GPUMaterial *> mats);
  */
 bool GPU_material_batch_is_ready(BatchHandle handle);
 /**
- * Asign the compiled shaders to their respective materials and flag their status.
+ * Assign the compiled shaders to their respective materials and flag their status.
  * The materials list should have the same length and order as in the `GPU_material_batch_compile`
  * call.
  * If the compilation has not finished yet, this call will block the thread until all the

source/blender/gpu/shaders/gpu_shader_sequencer_strips_frag.glsl

@@ -45,7 +45,7 @@ void main()
 
   /* Transform strip rectangle into pixel coordinates, so that
    * rounded corners have proper aspect ratio and can be expressed in pixels.
-   * Also snap to pixel grid coorinates, so that outline/border is clear
+   * Also snap to pixel grid coordinates, so that outline/border is clear
    * non-fractional pixel sizes. */
   vec2 view_to_pixel = vec2(context_data.inv_pixelx, context_data.inv_pixely);
   size = round(size * view_to_pixel);

source/blender/nodes/intern/geometry_nodes_execute.cc

@@ -442,8 +442,8 @@ static bool old_id_property_type_matches_socket_convert_to_new_string(
 }
 
 /**
- * Check if the given `old_property` property type is compatible with the given `socket` type. E.g.
- * a `SOCK_FLOAT` socket can use data from `IDP_FLOAT`, `IDP_INT` and `IDP_DOUBLE` idproperties.
+ * Check if the given `old_property` property type is compatible with the given `socket` type.
+ * E.g. a #SOCK_FLOAT socket can use data from #IDP_FLOAT, #IDP_INT and #IDP_DOUBLE ID-properties.
  *
  * If `new_property` is given, it is expected to be of the 'perfect match' type with the given
  * `socket` (see #id_property_create_from_socket), and its value will be set from the value of