Merge branch 'blender-v4.5-release'

source/blender/blenkernel/BKE_armature.hh

@@ -41,7 +41,7 @@ struct EditBone {
   /**
    * System-Defined Properties storage.
    *
-   * In Blender 4.5, only used to ensure forward compatibility with 5.x blendfiles, and data
+   * In Blender 4.5, only used to ensure forward compatibility with 5.x blend-files, and data
    * management consistency.
    */
   IDProperty *system_properties;

source/blender/blenkernel/BKE_curves_utils.hh

@@ -574,7 +574,7 @@ void gather_custom_knots(const bke::CurvesGeometry &src,
 
 /**
  * Overwrites `NURBS_KNOT_MODE_CUSTOM` to given ones for regular and cyclic curves.
- * The purpose is to to update knot modes for curves when knot copying or calculation is not
+ * The purpose is to update knot modes for curves when knot copying or calculation is not
  * possible or too complex. Curve operators not supporting NURBS custom knots should call this
  * function with `IndexMask` `CurvesGeometry.curves_range()`, if resulting curves are created by
  * copying all attributes. This way `NURBS_KNOT_MODE_CUSTOM` values might be copied though custom

source/blender/blenloader/intern/readfile.cc

@@ -3917,8 +3917,8 @@ BlendFileData *blo_read_file_internal(FileData *fd, const char *filepath)
                   bfd->filepath);
     }
 
-    /* This part is only to ensure forward compatibility with 5.0+ blendfiles in 4.5. It will be
-     * removed in 5.0. */
+    /* This part is only to ensure forward compatibility with 5.0+ blend-files in 4.5.
+     * It will be removed in 5.0. */
     long_id_names_process_action_slots_identifiers(bfd->main);
   }
   else {

source/blender/blenloader/intern/readfile.hh

@@ -42,7 +42,7 @@ struct OldNewMap;
 struct UserDef;
 
 /**
- * Store some critical informations about the read blendfile.
+ * Store some critical information about the read blend-file.
  */
 enum eFileDataFlag {
   FD_FLAGS_SWITCH_ENDIAN = 1 << 0,
@@ -56,7 +56,7 @@ enum eFileDataFlag {
    */
   FD_FLAGS_FILE_FUTURE = 1 << 5,
   /**
-   * The blendfile has IDs with invalid names (either using the 5.0+ new 'long names', or
+   * The blend-file has IDs with invalid names (either using the 5.0+ new 'long names', or
    * corrupted). I.e. their names have no null char in their first 66 bytes.
    */
   FD_FLAGS_HAS_INVALID_ID_NAMES = 1 << 6,

source/blender/blenloader/intern/versioning_450.cc

@@ -62,8 +62,8 @@ void version_forward_compat_system_idprops(Main *bmain)
 {
   auto idprops_process = [](IDProperty **idprops, IDProperty *system_idprops) -> void {
     if (system_idprops) {
-      /* Other ID pointers have not yet been relinked, do not try to access them for refcounting.
-       */
+      /* Other ID pointers have not yet been relinked,
+       * do not try to access them for reference-counting. */
       if (*idprops) {
         IDP_MergeGroup_ex(*idprops, system_idprops, true, LIB_ID_CREATE_NO_USER_REFCOUNT);
       }

source/blender/blenloader/intern/versioning_common.cc

@@ -205,7 +205,6 @@ void version_node_output_socket_name(bNodeTree *ntree,
   }
 }
 
-/* Find the base socket name for an idname that may include a subtype. */
 StringRef legacy_socket_idname_to_socket_type(StringRef idname)
 {
   using string_pair = std::pair<const char *, const char *>;

source/blender/blenloader/intern/versioning_common.hh

@@ -89,6 +89,9 @@ void version_node_output_socket_name(bNodeTree *ntree,
                                      const char *old_name,
                                      const char *new_name);
 
+/**
+ * Find the base socket name for an idname that may include a subtype.
+ */
 blender::StringRef legacy_socket_idname_to_socket_type(blender::StringRef idname);
 
 /**
@@ -195,14 +198,18 @@ void version_update_node_input(
 
 bNode *version_eevee_output_node_get(bNodeTree *ntree, int16_t node_type);
 
-/* Allow 4.5 to open 5.0+ files and recover their system-defined ID properties. */
+/**
+ * Allow 4.5 to open 5.0+ files and recover their system-defined ID properties.
+ */
 void version_forward_compat_system_idprops(Main *bmain);
 
 bool all_scenes_use(Main *bmain, const blender::Span<const char *> engines);
 
-/* Adjust the values of the given FCurve key frames by applying the given function. The function is
+/**
+ * Adjust the values of the given FCurve key frames by applying the given function. The function is
  * expected to get and return a float representing the value of the key frame. The FCurve is
- * potentially changed to have the given property type, if not already the case. */
+ * potentially changed to have the given property type, if not already the case.
+ */
 template<typename Function>
 static void adjust_fcurve_key_frame_values(FCurve *fcurve,
                                            const PropertyType property_type,

source/blender/draw/engines/eevee/eevee_instance.cc

@@ -224,7 +224,7 @@ void Instance::init(const int2 &output_res,
   loaded_shaders |= materials.default_materials_load_async();
 
   if (is_image_render) {
-    /* Ensure all deferred shaders have been compiled to kickstart async specialization. */
+    /* Ensure all deferred shaders have been compiled to kick-start asynchronous specialization. */
     loaded_shaders |= shaders.static_shaders_wait_ready(DEFERRED_LIGHTING_SHADERS);
   }
 

source/blender/geometry/intern/fit_curves.cc

@@ -120,7 +120,7 @@ bke::CurvesGeometry fit_poly_to_bezier_curves(const bke::CurvesGeometry &src_cur
     }
 
     if (error) {
-      /* Some error occured. Fall back to using the input positions as the (poly) curve. */
+      /* Some error occurred. Fall back to using the input positions as the (poly) curve. */
       dst_curve_sizes[curve_i] = points.size();
       dst_curve_types[curve_i] = CURVE_TYPE_POLY;
       return;

source/blender/makesdna/DNA_ID.h

@@ -445,7 +445,7 @@ typedef struct ID {
   /**
    * System-defined custom properties storage.
    *
-   * In Blender 4.5, only used to ensure forward compatibility with 5.x blendfiles, and data
+   * In Blender 4.5, only used to ensure forward compatibility with 5.x blend-files, and data
    * management consistency.
    */
   IDProperty *system_properties;

source/blender/makesdna/DNA_action_types.h

@@ -290,7 +290,7 @@ typedef struct bPoseChannel {
   /**
    * System-defined custom properties storage.
    *
-   * In Blender 4.5, only used to ensure forward compatibility with 5.x blendfiles, and data
+   * In Blender 4.5, only used to ensure forward compatibility with 5.x blend-files, and data
    * management consistency.
    */
   IDProperty *system_properties;

source/blender/makesdna/DNA_armature_types.h

@@ -64,7 +64,7 @@ typedef struct Bone {
   /**
    * System-Defined Properties storage.
    *
-   * In Blender 4.5, only used to ensure forward compatibility with 5.x blendfiles, and data
+   * In Blender 4.5, only used to ensure forward compatibility with 5.x blend-files, and data
    * management consistency.
    */
   IDProperty *system_properties;
@@ -287,7 +287,7 @@ typedef struct BoneCollection {
   /**
    * Custom system IDProperties.
    *
-   * In Blender 4.5, only used to ensure forward compatibility with 5.x blendfiles, and data
+   * In Blender 4.5, only used to ensure forward compatibility with 5.x blend-files, and data
    * management consistency.
    */
   struct IDProperty *system_properties;

source/blender/makesdna/DNA_layer_types.h

@@ -176,12 +176,12 @@ typedef struct ViewLayer {
 
   struct Material *mat_override;
   struct World *world_override;
-  /** Equivalent to datablocks ID properties. */
+  /** Equivalent to data-blocks ID properties. */
   struct IDProperty *id_properties;
   /**
-   * Equivalent to datablocks system-defined ID properties.
+   * Equivalent to data-blocks system-defined ID properties.
    *
-   * In Blender 4.5, only used to ensure forward compatibility with 5.x blendfiles, and data
+   * In Blender 4.5, only used to ensure forward compatibility with 5.x blend-files, and data
    * management consistency.
    */
   struct IDProperty *system_properties;

source/blender/makesdna/DNA_sequence_types.h

@@ -299,7 +299,7 @@ typedef struct Strip {
   /**
    * System-defined custom properties storage.
    *
-   * In Blender 4.5, only used to ensure forward compatibility with 5.x blendfiles, and data
+   * In Blender 4.5, only used to ensure forward compatibility with 5.x blend-files, and data
    * management consistency.
    */
   struct IDProperty *system_properties;