Cleanup: spelling in comments

31 files changed, 99 insertions, 95 deletions

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 19f92f0b361..2fc486687bb 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -1679,7 +1679,7 @@ static void editbmesh_calc_modifier_final_normals(const Mesh *mesh_input,
   if (!do_loop_normals) {
     BKE_mesh_ensure_normals_for_display(mesh_final);
 
-    /* Some modifiers, like datatransfer, may generate those data, we do not want to keep them,
+    /* Some modifiers, like data-transfer, may generate those data, we do not want to keep them,
      * as they are used by display code when available (i.e. even if autosmooth is disabled). */
     if (CustomData_has_layer(&mesh_final->ldata, CD_NORMAL)) {
       CustomData_free_layers(&mesh_final->ldata, CD_NORMAL, mesh_final->totloop);
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index 952859e0c7b..08faae9874b 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -284,7 +284,7 @@ void BKE_animdata_free(ID *id, const bool do_id_user)
 /* Copying -------------------------------------------- */
 
 /**
- * Make a copy of the given AnimData - to be used when copying datablocks.
+ * Make a copy of the given AnimData - to be used when copying data-blocks.
  * \param flag: Control ID pointers management,
  * see LIB_ID_CREATE_.../LIB_ID_COPY_... flags in BKE_library.h
  * \return The copied animdata.
@@ -464,7 +464,7 @@ static bool animpath_matches_basepath(const char path[], const char basepath[])
 /* Move F-Curves in src action to dst action, setting up all the necessary groups
  * for this to happen, but only if the F-Curves being moved have the appropriate
  * "base path".
- * - This is used when data moves from one datablock to another, causing the
+ * - This is used when data moves from one data-block to another, causing the
  *   F-Curves to need to be moved over too
  */
 void action_move_fcurves_by_basepath(bAction *srcAct, bAction *dstAct, const char basepath[])
@@ -638,7 +638,7 @@ void BKE_animdata_separate_by_basepath(Main *bmain, ID *srcID, ID *dstID, ListBa
  * they will get picked up by the dependency system.
  *
  * \param C: Context pointer - for getting active data
- * \param[in,out] ptr: RNA pointer for property's datablock.
+ * \param[in,out] ptr: RNA pointer for property's data-block.
  * May be modified as result of path remapping.
  * \param prop: RNA definition of property to add for
  * \return MEM_alloc'd string representing the path to the property from the given #PointerRNA
@@ -3260,7 +3260,7 @@ void nlastrip_evaluate(Depsgraph *depsgraph,
    * we tag the current strip as being evaluated, and clear this when we leave.
    */
   /* TODO: be careful with this flag, since some edit tools may be running and have
-   * set this while animplayback was running */
+   * set this while animation playback was running. */
   if (strip->flag & NLASTRIP_FLAG_EDIT_TOUCHED) {
     return;
   }
@@ -3524,7 +3524,7 @@ static bool animsys_evaluate_nla(Depsgraph *depsgraph,
           dummy_strip->extendmode = adt->act_extendmode;
         }
 
-        /* Unless extendmode is Nothing (might be useful for flattening NLA evaluation),
+        /* Unless extend-mode is Nothing (might be useful for flattening NLA evaluation),
          * disable range. */
         if (dummy_strip->extendmode != NLASTRIP_EXTEND_NOTHING) {
           dummy_strip->flag |= NLASTRIP_FLAG_NO_TIME_MAP;
@@ -3938,7 +3938,7 @@ void BKE_animsys_evaluate_all_animation(Main *main,
    * - this is like EVAL_ANIM_IDS, but this handles the case "embedded nodetrees"
    *   (i.e. scene/material/texture->nodetree) which we need a special exception
    *   for, otherwise they'd get skipped
-   * - ntp = "node tree parent" = datablock where node tree stuff resides
+   * - ntp = "node tree parent" = data-block where node tree stuff resides
    */
 #define EVAL_ANIM_NODETREE_IDS(first, NtId_Type, aflag) \
   for (id = first; id; id = id->next) { \
@@ -3956,7 +3956,7 @@ void BKE_animsys_evaluate_all_animation(Main *main,
   (void)0
 
   /* optimization:
-   * when there are no actions, don't go over database and loop over heaps of datablocks,
+   * when there are no actions, don't go over database and loop over heaps of data-blocks,
    * which should ultimately be empty, since it is not possible for now to have any animation
    * without some actions, and drivers wouldn't get affected by any state changes
    *
diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c
index c301588af0c..570805a01d0 100644
--- a/source/blender/blenkernel/intern/blendfile.c
+++ b/source/blender/blenkernel/intern/blendfile.c
@@ -362,7 +362,7 @@ static void setup_app_data(bContext *C,
 
   if (mode == LOAD_UNDO) {
     /* In undo/redo case, we do a whole lot of magic tricks to avoid having to re-read linked
-     * datablocks from libraries (since those are not supposed to change). Unfortunately, that
+     * data-blocks from libraries (since those are not supposed to change). Unfortunately, that
      * means that we do not reset their user count, however we do increase that one when doing
      * lib_link on local IDs using linked ones.
      * There is no real way to predict amount of changes here, so we have to fully redo
@@ -782,13 +782,13 @@ bool BKE_blendfile_write_partial(Main *bmain_src,
 
   /* Backup paths because remap relative will overwrite them.
    *
-   * NOTE: we do this only on the list of datablocks that we are writing
+   * NOTE: we do this only on the list of data-blocks that we are writing
    * because the restored full list is not guaranteed to be in the same
    * order as before, as expected by BKE_bpath_list_restore.
    *
    * This happens because id_sort_by_name does not take into account
    * string case or the library name, so the order is not strictly
-   * defined for two linked datablocks with the same name! */
+   * defined for two linked data-blocks with the same name! */
   if (write_flags & G_FILE_RELATIVE_REMAP) {
     path_list_backup = BKE_bpath_list_backup(bmain_dst, path_list_flag);
   }
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 04789adea2f..ee9041c5c18 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -5098,7 +5098,7 @@ static bConstraint *add_new_constraint_internal(const char *name, short type)
   const bConstraintTypeInfo *cti = BKE_constraint_typeinfo_from_type(type);
   const char *newName;
 
-  /* Set up a generic constraint datablock */
+  /* Set up a generic constraint data-block. */
   con->type = type;
   con->flag |= CONSTRAINT_EXPAND | CONSTRAINT_STATICOVERRIDE_LOCAL;
   con->enforce = 1.0f;
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 22bc44a88d8..3af54603d67 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -2298,7 +2298,7 @@ static CustomDataLayer *customData_add_layer__internal(CustomData *data,
   int flag = 0, index = data->totlayer;
   void *newlayerdata = NULL;
 
-  /* Passing a layerdata to copy from with an alloctype that won't copy is
+  /* Passing a layer-data to copy from with an alloctype that won't copy is
    * most likely a bug */
   BLI_assert(!layerdata || (alloctype == CD_ASSIGN) || (alloctype == CD_DUPLICATE) ||
              (alloctype == CD_REFERENCE));
diff --git a/source/blender/blenkernel/intern/data_transfer.c b/source/blender/blenkernel/intern/data_transfer.c
index 98c6d519d17..8dcf1f0d001 100644
--- a/source/blender/blenkernel/intern/data_transfer.c
+++ b/source/blender/blenkernel/intern/data_transfer.c
@@ -90,8 +90,10 @@ void BKE_object_data_transfer_dttypes_to_cdmask(const int dtdata_types,
   }
 }
 
-/* Check what can do each layer type
- * (if it is actually handled by transferdata, if it supports advanced mixing... */
+/**
+ * Check what can do each layer type
+ * (if it is actually handled by transfer-data, if it supports advanced mixing.
+ */
 bool BKE_object_data_transfer_get_dttypes_capacity(const int dtdata_types,
                                                    bool *r_advanced_mixing,
                                                    bool *r_threshold)
diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c
index 3bca77c5b51..754b3f5876d 100644
--- a/source/blender/blenkernel/intern/fcurve.c
+++ b/source/blender/blenkernel/intern/fcurve.c
@@ -2687,7 +2687,7 @@ static float fcurve_eval_keyframes(FCurve *fcu, BezTriple *bezts, float evaltime
 
             if (fabsf(v1[1] - v4[1]) < FLT_EPSILON && fabsf(v2[1] - v3[1]) < FLT_EPSILON &&
                 fabsf(v3[1] - v4[1]) < FLT_EPSILON) {
-              /* Optimisation: If all the handles are flat/at the same values,
+              /* Optimization: If all the handles are flat/at the same values,
                * the value is simply the shared value (see T40372 -> F91346)
                */
               cvalue = v1[1];
diff --git a/source/blender/blenkernel/intern/fmodifier.c b/source/blender/blenkernel/intern/fmodifier.c
index 794d07203af..4295a44098c 100644
--- a/source/blender/blenkernel/intern/fmodifier.c
+++ b/source/blender/blenkernel/intern/fmodifier.c
@@ -1418,7 +1418,7 @@ static float eval_fmodifier_influence(FModifier *fcm, float evaltime)
  *   several times by modifiers requesting the time be modified, as the final result
  *   would have required using the modified time
  * - modifiers only ever receive the unmodified time, as subsequent modifiers should be
- *   working on the 'global' result of the modified curve, not some localised segment,
+ *   working on the 'global' result of the modified curve, not some localized segment,
  *   so nevaltime gets set to whatever the last time-modifying modifier likes...
  * - we start from the end of the stack, as only the last one matters for now
  *
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 9960994400f..14b6bc953b2 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -4907,10 +4907,10 @@ static void image_user_id_eval_animation(struct Image *ima,
 void BKE_image_user_id_eval_animation(Depsgraph *depsgraph, ID *id)
 {
   /* This is called from the dependency graph to update the image
-   * users in datablocks. It computes the current frame number
+   * users in data-blocks. It computes the current frame number
    * and tags the image to be refreshed.
    * This does not consider nested node trees as these are handled
-   * as their own datablock. */
+   * as their own data-block. */
   bool skip_nested_nodes = true;
   image_walk_id_all_users(id, skip_nested_nodes, depsgraph, image_user_id_eval_animation);
 }
diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c
index 34b1f2e1837..e03b61bfba1 100644
--- a/source/blender/blenkernel/intern/ipo.c
+++ b/source/blender/blenkernel/intern/ipo.c
@@ -933,7 +933,7 @@ static const char *particle_adrcodes_to_paths(int adrcode, int *array_index)
  * and 'root' parts of path.
  *
  * Input:
- *     - id                      - the datablock that the curve's IPO block
+ *     - id                      - the data-block that the curve's IPO block
  *                                 is attached to and/or which the new paths will start from
  *     - blocktype, adrcode      - determines setting to get
  *     - actname, constname, seq - used to build path
@@ -1934,12 +1934,12 @@ static void nlastrips_to_animdata(ID *id, ListBase *strips)
 /* Called from do_versions() in readfile.c to convert the old 'IPO/adrcode' system
  * to the new 'Animato/RNA' system.
  *
- * The basic method used here, is to loop over datablocks which have IPO-data, and
- * add those IPO's to new AnimData blocks as Actions.
+ * The basic method used here, is to loop over data-blocks which have IPO-data,
+ * and add those IPO's to new AnimData blocks as Actions.
  * Action/NLA data only works well for Objects, so these only need to be checked for there.
  *
  * Data that has been converted should be freed immediately, which means that it is immediately
- * clear which datablocks have yet to be converted, and also prevent freeing errors when we exit.
+ * clear which data-blocks have yet to be converted, and also prevent freeing errors when we exit.
  */
 // XXX currently done after all file reading...
 void do_versions_ipos_to_animato(Main *bmain)
diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index 5bddec8a164..2b064c6b2a7 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -243,7 +243,7 @@ void BKE_view_layer_free_ex(ViewLayer *view_layer, const bool do_id_user)
 }
 
 /**
- * Tag all the selected objects of a renderlayer
+ * Tag all the selected objects of a render-layer.
  */
 void BKE_view_layer_selected_objects_tag(ViewLayer *view_layer, const int tag)
 {
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 7ea77ec2849..2a32c215d2a 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -329,7 +329,7 @@ void BKE_id_copy_ensure_local(Main *bmain, const ID *old_id, ID *new_id)
 }
 
 /**
- * Generic 'make local' function, works for most of datablock types...
+ * Generic 'make local' function, works for most of data-block types...
  */
 void BKE_id_make_local_generic(Main *bmain,
                                ID *id,
@@ -609,7 +609,7 @@ bool BKE_id_copy_is_allowed(const ID *id)
 }
 
 /**
- * Generic entry point for copying a datablock (new API).
+ * Generic entry point for copying a data-block (new API).
  *
  * \note Copy is only affecting given data-block
  * (no ID used by copied one will be affected, besides usercount).
@@ -619,7 +619,7 @@ bool BKE_id_copy_is_allowed(const ID *id)
  * \note Usercount of new copy is always set to 1.
  *
  * \param bmain: Main database, may be NULL only if LIB_ID_CREATE_NO_MAIN is specified.
- * \param id: Source datablock.
+ * \param id: Source data-block.
  * \param r_newid: Pointer to new (copied) ID pointer.
  * \param flag: Set of copy options, see DNA_ID.h enum for details
  * (leave to zero for default, full copy).
@@ -876,7 +876,7 @@ bool id_single_user(bContext *C, ID *id, PointerRNA *ptr, PropertyRNA *prop)
         RNA_property_pointer_set(ptr, prop, idptr, NULL);
         RNA_property_update(C, ptr, prop);
 
-        /* tag grease pencil datablock and disable onion */
+        /* tag grease pencil data-block and disable onion */
         if (GS(id->name) == ID_GD) {
           DEG_id_tag_update(id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY);
           DEG_id_tag_update(newid, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY);
@@ -920,7 +920,7 @@ static int libblock_management_us_min(void *UNUSED(user_data),
   return IDWALK_RET_NOP;
 }
 
-/** Add a 'NO_MAIN' datablock to given main (also sets usercounts of its IDs if needed). */
+/** Add a 'NO_MAIN' data-block to given main (also sets usercounts of its IDs if needed). */
 void BKE_libblock_management_main_add(Main *bmain, void *idv)
 {
   ID *id = idv;
@@ -950,7 +950,7 @@ void BKE_libblock_management_main_add(Main *bmain, void *idv)
   BKE_main_unlock(bmain);
 }
 
-/** Remove a datablock from given main (set it to 'NO_MAIN' status). */
+/** Remove a data-block from given main (set it to 'NO_MAIN' status). */
 void BKE_libblock_management_main_remove(Main *bmain, void *idv)
 {
   ID *id = idv;
@@ -1121,7 +1121,7 @@ void BKE_main_lib_objects_recalc_all(Main *bmain)
 /* *********** ALLOC AND FREE *****************
  *
  * BKE_libblock_free(ListBase *lb, ID *id )
- * provide a list-basis and datablock, but only ID is read
+ * provide a list-basis and data-block, but only ID is read
  *
  * void *BKE_libblock_alloc(ListBase *lb, type, name)
  * inserts in list and returns a new ID
@@ -1129,7 +1129,7 @@ void BKE_main_lib_objects_recalc_all(Main *bmain)
  * **************************** */
 
 /**
- * Get allocation size fo a given datablock type and optionally allocation name.
+ * Get allocation size fo a given data-block type and optionally allocation name.
  */
 size_t BKE_libblock_get_alloc_info(short type, const char **name)
 {
@@ -1369,7 +1369,7 @@ void BKE_libblock_init_empty(ID *id)
   }
 }
 
-/** Generic helper to create a new empty datablock of given type in given \a bmain database.
+/** Generic helper to create a new empty data-block of given type in given \a bmain database.
  *
  * \param name: can be NULL, in which case we get default name for this ID type. */
 void *BKE_id_new(Main *bmain, const short type, const char *name)
@@ -1387,7 +1387,7 @@ void *BKE_id_new(Main *bmain, const short type, const char *name)
 }
 
 /**
- * Generic helper to create a new temporary empty datablock of given type,
+ * Generic helper to create a new temporary empty data-block of given type,
  * *outside* of any Main database.
  *
  * \param name: can be NULL, in which case we get default name for this ID type. */
@@ -1566,7 +1566,7 @@ static ID *is_dupid(ListBase *lb, ID *id, const char *name)
  *
  * Normally the ID that's being check is already in the ListBase, so ID *id
  * points at the new entry.  The Python Library module needs to know what
- * the name of a datablock will be before it is appended; in this case ID *id
+ * the name of a data-block will be before it is appended; in this case ID *id
  * id is NULL
  */
 
@@ -1760,7 +1760,7 @@ void id_clear_lib_data_ex(Main *bmain, ID *id, const bool id_in_mainlist)
     }
   }
 
-  /* Internal bNodeTree blocks inside datablocks also stores id->lib,
+  /* Internal bNodeTree blocks inside data-blocks also stores id->lib,
    * make sure this stays in sync. */
   if ((ntree = ntreeFromID(id))) {
     id_clear_lib_data_ex(bmain, &ntree->id, false); /* Datablocks' nodetree is never in Main. */
@@ -1906,11 +1906,11 @@ static void library_make_local_copying_check(ID *id,
   BLI_gset_remove(loop_tags, id, NULL);
 }
 
-/** Make linked datablocks local.
+/** Make linked data-blocks local.
  *
  * \param bmain: Almost certainly global main.
- * \param lib: If not NULL, only make local datablocks from this library.
- * \param untagged_only: If true, only make local datablocks not tagged with
+ * \param lib: If not NULL, only make local data-blocks from this library.
+ * \param untagged_only: If true, only make local data-blocks not tagged with
  * LIB_TAG_PRE_EXISTING. \param set_fake: If true, set fake user on all localized data-blocks
  * (except group and objects ones).
  */
@@ -1947,12 +1947,12 @@ void BKE_library_make_local(Main *bmain,
   TIMEIT_VALUE_PRINT(make_local);
 #endif
 
-  /* Step 1: Detect datablocks to make local. */
+  /* Step 1: Detect data-blocks to make local. */
   for (int a = set_listbasepointers(bmain, lbarray); a--;) {
     ID *id = lbarray[a]->first;
 
     /* Do not explicitly make local non-linkable IDs (shapekeys, in fact),
-     * they are assumed to be handled by real datablocks responsible of them. */
+     * they are assumed to be handled by real data-blocks responsible of them. */
     const bool do_skip = (id && !BKE_idcode_is_linkable(GS(id->name)));
 
     for (; id; id = id->next) {
@@ -2000,11 +2000,11 @@ void BKE_library_make_local(Main *bmain,
   }
 
 #ifdef DEBUG_TIME
-  printf("Step 1: Detect datablocks to make local: Done.\n");
+  printf("Step 1: Detect data-blocks to make local: Done.\n");
   TIMEIT_VALUE_PRINT(make_local);
 #endif
 
-  /* Step 2: Check which datablocks we can directly make local
+  /* Step 2: Check which data-blocks we can directly make local
    * (because they are only used by already, or future, local data),
    * others will need to be duplicated. */
   GSet *loop_tags = BLI_gset_ptr_new(__func__);
@@ -2019,7 +2019,7 @@ void BKE_library_make_local(Main *bmain,
   BKE_main_relations_free(bmain);
 
 #ifdef DEBUG_TIME
-  printf("Step 2: Check which datablocks we can directly make local: Done.\n");
+  printf("Step 2: Check which data-blocks we can directly make local: Done.\n");
   TIMEIT_VALUE_PRINT(make_local);
 #endif
 
@@ -2385,7 +2385,7 @@ static int id_order_compare(const void *a, const void *b)
 }
 
 /**
- * Returns ordered list of datablocks for display in the UI.
+ * Returns ordered list of data-blocks for display in the UI.
  * Result is list of LinkData of IDs that must be freed.
  */
 void BKE_id_ordered_list(ListBase *ordered_lb, const ListBase *lb)
diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c
index 085051f633c..2b8973ff873 100644
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@ -1073,7 +1073,7 @@ FOREACH_FINALIZE:
 #undef FOREACH_CALLBACK_INVOKE
 
 /**
- * Loop over all of the ID's this datablock links to.
+ * Loop over all of the ID's this data-block links to.
  */
 void BKE_library_foreach_ID_link(
     Main *bmain, ID *id, LibraryIDLinkCallback callback, void *user_data, int flag)
@@ -1096,7 +1096,7 @@ void BKE_library_update_ID_link_user(ID *id_dst, ID *id_src, const int cb_flag)
 }
 
 /**
- * Say whether given \a id_type_owner can use (in any way) a datablock of \a id_type_used.
+ * Say whether given \a id_type_owner can use (in any way) a data-block of \a id_type_used.
  *
  * This is a 'simplified' abstract version of #BKE_library_foreach_ID_link() above,
  * quite useful to reduce* useless iterations in some cases.
@@ -1123,7 +1123,7 @@ bool BKE_library_id_can_use_idtype(ID *id_owner, const short id_type_used)
   }
 
   if (BKE_animdata_from_id(id_owner)) {
-    /* AnimationData can use virtually any kind of datablocks, through drivers especially. */
+    /* AnimationData can use virtually any kind of data-blocks, through drivers especially. */
     return true;
   }
 
@@ -1409,11 +1409,11 @@ static int foreach_libblock_used_linked_data_tag_clear_cb(void *user_data,
 /**
  * Detect orphaned linked data blocks (i.e. linked data not used (directly or indirectly)
  * in any way by any local data), including complex cases like 'linked archipelagoes', i.e.
- * linked datablocks that use each other in loops,
+ * linked data-blocks that use each other in loops,
  * which prevents their deletion by 'basic' usage checks.
  *
  * \param do_init_tag: if \a true, all linked data are checked, if \a false,
- * only linked datablocks already tagged with #LIB_TAG_DOIT are checked.
+ * only linked data-blocks already tagged with #LIB_TAG_DOIT are checked.
  */
 void BKE_library_unused_linked_data_set_tag(Main *bmain, const bool do_init_tag)
 {
@@ -1445,12 +1445,12 @@ void BKE_library_unused_linked_data_set_tag(Main *bmain, const bool do_init_tag)
 }
 
 /**
- * Untag linked data blocks used by other untagged linked datablocks.
- * Used to detect datablocks that we can forcefully make local
+ * Untag linked data blocks used by other untagged linked data-blocks.
+ * Used to detect data-blocks that we can forcefully make local
  * (instead of copying them to later get rid of original):
- * All datablocks we want to make local are tagged by caller,
- * after this function has ran caller knows datablocks still tagged can directly be made local,
- * since they are only used by other datablocks that will also be made fully local.
+ * All data-blocks we want to make local are tagged by caller,
+ * after this function has ran caller knows data-blocks still tagged can directly be made local,
+ * since they are only used by other data-blocks that will also be made fully local.
  */
 void BKE_library_indirectly_used_data_tag_clear(Main *bmain)
 {
diff --git a/source/blender/blenkernel/intern/library_remap.c b/source/blender/blenkernel/intern/library_remap.c
index 802f13ea69f..fb457c9f678 100644
--- a/source/blender/blenkernel/intern/library_remap.c
+++ b/source/blender/blenkernel/intern/library_remap.c
@@ -266,8 +266,8 @@ static int foreach_libblock_remap_callback(void *user_data, ID *id_self, ID **id
       }
       if (cb_flag & IDWALK_CB_USER) {
         /* NOTE: We don't user-count IDs which are not in the main database.
-         * This is because in certain conditions we can have datablocks in
-         * the main which are referencing datablocks outside of it.
+         * This is because in certain conditions we can have data-blocks in
+         * the main which are referencing data-blocks outside of it.
          * For example, BKE_mesh_new_from_object() called on an evaluated
          * object will cause such situation.
          */
@@ -409,7 +409,7 @@ static void libblock_remap_data_postprocess_nodetree_update(Main *bmain, ID *new
 }
 
 /**
- * Execute the 'data' part of the remapping (that is, all ID pointers from other ID datablocks).
+ * Execute the 'data' part of the remapping (that is, all ID pointers from other ID data-blocks).
  *
  * Behavior differs depending on whether given \a id is NULL or not:
  * - \a id NULL: \a old_id must be non-NULL, \a new_id may be NULL (unlinking \a old_id) or not
@@ -419,14 +419,14 @@ static void libblock_remap_data_postprocess_nodetree_update(Main *bmain, ID *new
  * - \a id is non-NULL:
  *   + If \a old_id is NULL, \a new_id must also be NULL,
  *     and all ID pointers from \a id are cleared
- *     (i.e. \a id does not references any other datablock anymore).
+ *     (i.e. \a id does not references any other data-block anymore).
  *   + If \a old_id is non-NULL, behavior is as with a NULL \a id, but only within given \a id.
  *
  * \param bmain: the Main data storage to operate on (must never be NULL).
- * \param id: the datablock to operate on
+ * \param id: the data-block to operate on
  * (can be NULL, in which case we operate over all IDs from given bmain).
- * \param old_id: the datablock to dereference (may be NULL if \a id is non-NULL).
- * \param new_id: the new datablock to replace \a old_id references with (may be NULL).
+ * \param old_id: the data-block to dereference (may be NULL if \a id is non-NULL).
+ * \param new_id: the new data-block to replace \a old_id references with (may be NULL).
  * \param r_id_remap_data: if non-NULL, the IDRemap struct to use
  * (uselful to retrieve info about remapping process).
  */
diff --git a/source/blender/blenkernel/intern/lightprobe.c b/source/blender/blenkernel/intern/lightprobe.c
index 5e6d298adbf..01b368ee0f8 100644
--- a/source/blender/blenkernel/intern/lightprobe.c
+++ b/source/blender/blenkernel/intern/lightprobe.c
@@ -60,7 +60,7 @@ void *BKE_lightprobe_add(Main *bmain, const char *name)
 }
 
 /**
- * Only copy internal data of LightProbe ID from source
+ * Only copy internal data of #LightProbe ID from source
  * to already allocated/initialized destination.
  * You probably never want to use that directly,
  * use #BKE_id_copy or #BKE_id_copy_ex for typical needs.
diff --git a/source/blender/blenkernel/intern/main.c b/source/blender/blenkernel/intern/main.c
index e50e37c5428..170b8d0ab93 100644
--- a/source/blender/blenkernel/intern/main.c
+++ b/source/blender/blenkernel/intern/main.c
@@ -483,7 +483,7 @@ ListBase *which_libbase(Main *bmain, short type)
 int set_listbasepointers(Main *bmain, ListBase **lb)
 {
   /* BACKWARDS! also watch order of free-ing! (mesh<->mat), first items freed last.
-   * This is important because freeing data decreases usercounts of other datablocks,
+   * This is important because freeing data decreases user-counts of other data-blocks,
    * if this data is its self freed it can crash. */
   lb[INDEX_ID_LI] = &(
       bmain->libraries); /* Libraries may be accessed from pretty much any other ID... */
diff --git a/source/blender/blenkernel/intern/mask_rasterize.c b/source/blender/blenkernel/intern/mask_rasterize.c
index fe6ef2e047d..f5f0dbc6610 100644
--- a/source/blender/blenkernel/intern/mask_rasterize.c
+++ b/source/blender/blenkernel/intern/mask_rasterize.c
@@ -31,6 +31,7 @@
  * This file is admittedly a bit confusticated,
  * in quite few areas speed was chosen over readability,
  * though it is commented - so shouldn't be so hard to see what's going on.
+ *
  * Implementation:
  *
  * To rasterize the mask its converted into geometry that use a ray-cast for each pixel lookup.
diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c
index 8d149af6a1f..6f5eb69e80f 100644
--- a/source/blender/blenkernel/intern/movieclip.c
+++ b/source/blender/blenkernel/intern/movieclip.c
@@ -1515,7 +1515,7 @@ static void movieclip_build_proxy_ibuf(
     scaleibuf->planes = 24;
   }
 
-  /* TODO: currently the most weak part of multithreaded proxies,
+  /* TODO: currently the most weak part of multi-threaded proxies,
    *       could be solved in a way that thread only prepares memory
    *       buffer and write to disk happens separately
    */
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c
index e3953af7cbf..7fefabd1c12 100644
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@ -2314,7 +2314,7 @@ static void multires_sync_levels(Scene *scene, Object *ob_src, Object *ob_dst)
   if (!mmd_src) {
     /* object could have MDISP even when there is no multires modifier
      * this could lead to troubles due to i've got no idea how mdisp could be
-     * upsampled correct without modifier data.
+     * up-sampled correct without modifier data.
      * just remove mdisps if no multires present (nazgul) */
 
     multires_customdata_delete(ob_src->data);
diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c
index ae786a7d2c5..0b06bfab2ab 100644
--- a/source/blender/blenkernel/intern/nla.c
+++ b/source/blender/blenkernel/intern/nla.c
@@ -1856,7 +1856,7 @@ bool BKE_nla_action_stash(AnimData *adt)
   BLI_assert(nlt != NULL);
 
   /* We need to ensure that if there wasn't any previous instance,
-   * it must go to tbe bottom of the stack. */
+   * it must go to be bottom of the stack. */
   if (prev_track == NULL) {
     BLI_remlink(&adt->nla_tracks, nlt);
     BLI_addhead(&adt->nla_tracks, nlt);
diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c
index 6dee936ca76..84e46f1ef70 100644
--- a/source/blender/blenkernel/intern/object_update.c
+++ b/source/blender/blenkernel/intern/object_update.c
@@ -139,7 +139,7 @@ void BKE_object_eval_transform_final(Depsgraph *depsgraph, Object *ob)
 {
   DEG_debug_print_eval(depsgraph, __func__, ob->id.name, ob);
   /* Make sure inverse matrix is always up to date. This way users of it
-   * do not need to worry about relcalculating it. */
+   * do not need to worry about recalculating it. */
   invert_m4_m4(ob->imat, ob->obmat);
   /* Set negative scale flag in object. */
   if (is_negative_m4(ob->obmat)) {
diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c
index a49d2da8cfc..44dbf7a1e47 100644
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@ -1031,7 +1031,7 @@ static void pbvh_update_normals_accum_task_cb(void *__restrict userdata,
 
         if (bvh->verts[v].flag & ME_VERT_PBVH_UPDATE) {
           /* Note: This avoids `lock, add_v3_v3, unlock`
-           * and is five to ten times quicker than a spinlock.
+           * and is five to ten times quicker than a spin-lock.
            * Not exact equivalent though, since atomicity is only ensured for one component
            * of the vector at a time, but here it shall not make any sensible difference. */
           for (int k = 3; k--;) {
diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c
index 25f9948a835..cb4505880e2 100644
--- a/source/blender/blenkernel/intern/pbvh_bmesh.c
+++ b/source/blender/blenkernel/intern/pbvh_bmesh.c
@@ -1664,8 +1664,8 @@ struct FastNodeBuildInfo {
 
 /**
  * Recursively split the node if it exceeds the leaf_limit.
- * This function is multithreadabe since each invocation applies
- * to a sub part of the arrays
+ * This function is multi-threadabe since each invocation applies
+ * to a sub part of the arrays.
  */
 static void pbvh_bmesh_node_limit_ensure_fast(
     PBVH *bvh, BMFace **nodeinfo, BBC *bbc_array, struct FastNodeBuildInfo *node, MemArena *arena)
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index 2a64a50213c..d441ffdc8ff 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -3341,7 +3341,7 @@ int BKE_ptcache_write(PTCacheID *pid, unsigned int cfra)
 
   return !error;
 }
-/* youll need to close yourself after!
+/* you'll need to close yourself after!
  * mode - PTCACHE_CLEAR_ALL,
  */
 
diff --git a/source/blender/blenkernel/intern/seqcache.c b/source/blender/blenkernel/intern/seqcache.c
index 6f5b5f90d37..ff54327e406 100644
--- a/source/blender/blenkernel/intern/seqcache.c
+++ b/source/blender/blenkernel/intern/seqcache.c
@@ -40,7 +40,9 @@
 #include "BKE_scene.h"
 #include "BKE_main.h"
 
-/* ***************************** Sequencer cache design notes ******************************
+/**
+ * Sequencer Cache Design Notes
+ * ============================
  *
  * Cache key members:
  * is_temp_cache - this cache entry will be freed before rendering next frame
@@ -50,8 +52,8 @@
  *
  * Linking: We use links to reduce number of iterations needed to manage cache.
  * Entries are linked in order as they are put into cache.
- * Only pernament (is_temp_cache = 0) cache entries are linked.
- * Putting SEQ_CACHE_STORE_FINAL_OUT will reset linking
+ * Only permanent (is_temp_cache = 0) cache entries are linked.
+ * Putting #SEQ_CACHE_STORE_FINAL_OUT will reset linking
  *
  * Function:
  * All images created during rendering are added to cache, even if the cache is already full.
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index bfc6565819c..2514bad5709 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -347,7 +347,7 @@ void BKE_sequencer_free_clipboard(void)
  * note that these pointers should _never_ be access in the sequencer,
  * they are only for storage while in the clipboard
  * notice 'newid' is used for temp pointer storage here, validate on access (this is safe usage,
- * since those datablocks are fully out of Main lists).
+ * since those data-blocks are fully out of Main lists).
  */
 #define ID_PT (*id_pt)
 static void seqclipboard_ptr_free(Main *UNUSED(bmain), ID **id_pt)
@@ -406,7 +406,7 @@ static void seqclipboard_ptr_restore(Main *bmain, ID **id_pt)
       }
     }
 
-    /* Replace with pointer to actual datablock. */
+    /* Replace with pointer to actual data-block. */
     seqclipboard_ptr_free(bmain, id_pt);
     ID_PT = id_restore;
   }
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c
index 55236bfefd0..5af3f22cad2 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -952,7 +952,7 @@ static void free_softbody_intern(SoftBody *sb)
  *
  * it actually checks if the particle intrudes a short range force field generated
  * by the faces of the target object and returns a force to drive the particel out
- * the strength of the field grows exponetially if the particle is on the 'wrong' side of the face
+ * the strength of the field grows exponentially if the particle is on the 'wrong' side of the face
  * 'wrong' side : projection to the face normal is negative (all referred to a vertex in the face)
  *
  * flaw of this: 'fast' particles as well as 'fast' colliding faces
@@ -962,7 +962,7 @@ static void free_softbody_intern(SoftBody *sb)
  * besides our h is way larger than in QM because forces propagate way slower here
  * we have to deal with fuzzy(time) in the range of 1/25 seconds (typical frame rate)
  * yup collision targets are not known here any better
- * and 1/25 second is looong compared to real collision events
+ * and 1/25 second is very long compared to real collision events
  * Q: why not use 'simple' collision here like bouncing back a particle
  *   --> reverting is velocity on the face normal
  * A: because our particles are not alone here
@@ -1707,11 +1707,10 @@ static int sb_detect_vertex_collisionCached(float opco[3],
             copy_v3_v3(nv3, mvert[vt->tri[2]].co);
 
             if (mprevvert) {
-              /* grab the average speed of the collider vertices
-               * before we spoil nvX
+              /* Grab the average speed of the collider vertices before we spoil nvX
                * humm could be done once a SB steps but then we' need to store that too
-               * since the AABB reduced propabitlty to get here drasticallly
-               * it might be a nice tradeof CPU <--> memory
+               * since the AABB reduced probability to get here drastically
+               * it might be a nice tradeoff CPU <--> memory.
                */
               sub_v3_v3v3(vv1, nv1, mprevvert[vt->tri[0]].co);
               sub_v3_v3v3(vv2, nv2, mprevvert[vt->tri[1]].co);
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index dfa0783de06..038fc603364 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -71,16 +71,16 @@ BLI_INLINE void sound_verify_evaluated_id(ID *id)
   UNUSED_VARS_NDEBUG(id);
   /* This is a bit tricky and not quite reliable, but good enough check.
    *
-   * We don't want audio system handles to be allocated on amn original datablocks, and only want
-   * them to be allocated on a datablocks which are result of dependency graph evaluation.
+   * We don't want audio system handles to be allocated on an original data-blocks, and only want
+   * them to be allocated on a data-blocks which are result of dependency graph evaluation.
    *
-   * Datablocks which are covered by a copy-on-write system of dependency graph will have
-   * LIB_TAG_COPIED_ON_WRITE tag set on them. But if some of datablocks during its evaluation
+   * Data-blocks which are covered by a copy-on-write system of dependency graph will have
+   * LIB_TAG_COPIED_ON_WRITE tag set on them. But if some of data-blocks during its evaluation
    * decides to re-allocate it's nested one (for example, object evaluation could re-allocate mesh
-   * when evaluating modifier stack). Such datablocks will have LIB_TAG_COPIED_ON_WRITE_EVAL_RESULT
-   * tag set on them.
+   * when evaluating modifier stack). Such data-blocks will have
+   * LIB_TAG_COPIED_ON_WRITE_EVAL_RESULT tag set on them.
    *
-   * Additionally, we also allow datablocks outside of main database. Those can not be "original"
+   * Additionally, we also allow data-blocks outside of main database. Those can not be "original"
    * and could be used as a temporary evaluated result during operations like baking.
    *
    * NOTE: We conder ID evaluated if ANY of those flags is set. We do NOT require ALL of them. */
@@ -608,7 +608,7 @@ void *BKE_sound_add_scene_sound(
     Scene *scene, Sequence *sequence, int startframe, int endframe, int frameskip)
 {
   sound_verify_evaluated_id(&scene->id);
-  /* Happens when sequence's sound datablock was removed. */
+  /* Happens when sequence's sound data-block was removed. */
   if (sequence->sound == NULL) {
     return NULL;
   }
diff --git a/source/blender/blenkernel/intern/subdiv_converter_mesh.c b/source/blender/blenkernel/intern/subdiv_converter_mesh.c
index fc0c5db4466..37ca6d0e485 100644
--- a/source/blender/blenkernel/intern/subdiv_converter_mesh.c
+++ b/source/blender/blenkernel/intern/subdiv_converter_mesh.c
@@ -61,7 +61,7 @@ typedef struct ConverterStorage {
    */
   int *manifold_vertex_index;
   /* Indexed by vertex index from mesh, corresponds to whether this vertex has
-   * infinite sharpness due to non-manifol topology.
+   * infinite sharpness due to non-manifold topology.
    */
   BLI_bitmap *infinite_sharp_vertices_map;
   /* Reverse mapping to above. */
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index ad81fc49b19..4171c1aac4f 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -2294,7 +2294,7 @@ static struct PBVH *ccgDM_getPBVH(Object *ob, DerivedMesh *dm)
   }
 
   if (ob->sculpt->pbvh) {
-    /* Note that we have to clean up exisitng pbvh instead of updating it in case it does not
+    /* Note that we have to clean up existing pbvh instead of updating it in case it does not
      * match current grid_pbvh status. */
     const PBVHType pbvh_type = BKE_pbvh_type(ob->sculpt->pbvh);
     if (grid_pbvh) {
@@ -3016,7 +3016,7 @@ struct DerivedMesh *subsurf_make_derived_from_derived(struct DerivedMesh *dm,
          * subsurf structure in order to save computation time since
          * re-creation is rather a complicated business.
          *
-         * TODO(sergey): There was a good eason why final calculation
+         * TODO(sergey): There was a good reason why final calculation
          * used to free entirely cached subsurf structure. reason of
          * this is to be investigated still to be sure we don't have
          * regressions here.
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index f07751e349f..7d5862c1fb6 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -2019,7 +2019,7 @@ static void txt_undo_add_unprefix_op(Text *text,
    * 4 bytes */
   txt_undo_store_uint32(utxt->buf, &utxt->pos, line_index_mask_len);
 
-  /* Adding linenumbers of lines that shall not be indented if undoing.
+  /* Adding line-numbers of lines that shall not be indented if undoing.
    * 'line_index_mask_len * 4' bytes */
   for (idata = line_index_mask->first; idata; idata = idata->next) {
     txt_undo_store_uint32(utxt->buf, &utxt->pos, idata->value);