Cleanup: spelling in comments

6 files changed, 24 insertions, 24 deletions

diff --git a/source/blender/blenloader/intern/blend_validate.c b/source/blender/blenloader/intern/blend_validate.c
index 323ecedb971..7fe06d90ac1 100644
--- a/source/blender/blenloader/intern/blend_validate.c
+++ b/source/blender/blenloader/intern/blend_validate.c
@@ -18,7 +18,7 @@
  * \ingroup blenloader
  *
  * Utils to check/validate a Main is in sane state,
- * only checks relations between datablocks and libraries for now.
+ * only checks relations between data-blocks and libraries for now.
  *
  * \note Does not *fix* anything, only reports found errors.
  */
@@ -77,7 +77,7 @@ bool BLO_main_validate_libraries(Main *bmain, ReportList *reports)
   for (Main *curmain = bmain->next; curmain != NULL; curmain = curmain->next) {
     Library *curlib = curmain->curlib;
     if (curlib == NULL) {
-      BKE_report(reports, RPT_ERROR, "Library database with NULL library datablock!");
+      BKE_report(reports, RPT_ERROR, "Library database with NULL library data-block!");
       continue;
     }
 
diff --git a/source/blender/blenloader/intern/readblenentry.c b/source/blender/blenloader/intern/readblenentry.c
index 4b22a59a155..a4b96c9e59c 100644
--- a/source/blender/blenloader/intern/readblenentry.c
+++ b/source/blender/blenloader/intern/readblenentry.c
@@ -129,7 +129,7 @@ void BLO_blendhandle_print_sizes(BlendHandle *bh, void *fp)
 }
 
 /**
- * Gets the names of all the datablocks in a file of a certain type
+ * Gets the names of all the data-blocks in a file of a certain type
  * (e.g. all the scene names in a file).
  *
  * \param bh: The blendhandle to access.
@@ -161,7 +161,7 @@ LinkNode *BLO_blendhandle_get_datablock_names(BlendHandle *bh, int ofblocktype,
 }
 
 /**
- * Gets the previews of all the datablocks in a file of a certain type
+ * Gets the previews of all the data-blocks in a file of a certain type
  * (e.g. all the scene previews in a file).
  *
  * \param bh: The blendhandle to access.
@@ -251,7 +251,7 @@ LinkNode *BLO_blendhandle_get_previews(BlendHandle *bh, int ofblocktype, int *to
 }
 
 /**
- * Gets the names of all the linkable datablock types available in a file.
+ * Gets the names of all the linkable data-block types available in a file.
  * (e.g. "Scene", "Mesh", "Light", etc.).
  *
  * \param bh: The blendhandle to access.
@@ -357,7 +357,7 @@ BlendFileData *BLO_read_from_memory(const void *mem,
  * (assuming their data are already loaded & valid).
  *
  * \param oldmain: old main,
- * from which we will keep libraries and other datablocks that should not have changed.
+ * from which we will keep libraries and other data-blocks that should not have changed.
  * \param filename: current file, only for retrieving library data.
  */
 BlendFileData *BLO_read_from_memfile(Main *oldmain,
@@ -439,7 +439,7 @@ BlendFileData *BLO_read_from_memfile(Main *oldmain,
 #endif
         }
       }
-      /* In any case, we need to move all lib datablocks themselves - those are
+      /* In any case, we need to move all lib data-blocks themselves - those are
        * 'first level data', getting rid of them would imply updating spaces & co
        * to prevent invalid pointers access. */
       BLI_movelisttolist(&newmain->libraries, &oldmain->libraries);
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 6ea61980fd0..ec616907a35 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -212,7 +212,7 @@
  * - link all LibBlocks and indirect pointers to libblocks
  * - initialize #FileGlobal and copy pointers to #Global
  *
- * \note Still a weak point is the new-address function, that doesnt solve reading from
+ * \note Still a weak point is the new-address function, that doesn't solve reading from
  * multiple files at the same time.
  * (added remark: oh, i thought that was solved? will look at that... (ton).
  */
@@ -676,8 +676,8 @@ static Main *blo_find_main(FileData *fd, const char *filepath, const char *relab
   m = BKE_main_new();
   BLI_addtail(mainlist, m);
 
-  /* Add library datablock itself to 'main' Main, since libraries are **never** linked data.
-   * Fixes bug where you could end with all ID_LI datablocks having the same name... */
+  /* Add library data-block itself to 'main' Main, since libraries are **never** linked data.
+   * Fixes bug where you could end with all ID_LI data-blocks having the same name... */
   lib = BKE_libblock_alloc(mainlist->first, ID_LI, BLI_path_basename(filepath), 0);
   lib->id.us = ID_FAKE_USERS(
       lib); /* Important, consistency with main ID reading code from read_libblock(). */
@@ -9488,8 +9488,8 @@ static void lib_link_all(FileData *fd, Main *main)
   BLO_main_validate_shapekeys(main, NULL);
 
   if (fd->memfile != NULL) {
-    /* When doing redo, we perform a tremendous amount of esoterics magic tricks to avoid having to
-     * re-read all library datablocks.
+    /* When doing redo, we perform a tremendous amount of esoteric magic tricks to avoid having to
+     * re-read all library data-blocks.
      * Unfortunately, that means that we do not clear Collections' parents lists, which then get
      * improperly extended in some cases by lib_link_scene() and lib_link_collection() calls above
      * (when ome local collection is parent of linked ones).
@@ -9810,7 +9810,7 @@ static void sort_bhead_old_map(FileData *fd)
 
 static BHead *find_previous_lib(FileData *fd, BHead *bhead)
 {
-  /* skip library datablocks in undo, see comment in read_libblock */
+  /* Skip library data-blocks in undo, see comment in read_libblock. */
   if (fd->memfile) {
     return NULL;
   }
@@ -11680,7 +11680,7 @@ static void read_library_linked_ids(FileData *basefd,
         /* BLI_assert(*realid != NULL); */
 
         /* Now that we have a real ID, replace all pointers to placeholders in
-         * fd->libmap with pointers to the real datablocks. We do this for all
+         * fd->libmap with pointers to the real data-blocks. We do this for all
          * libraries since multiple might be referencing this ID. */
         change_link_placeholder_to_real_ID_pointer(mainlist, basefd, id, *realid);
 
@@ -11785,11 +11785,11 @@ static void read_libraries(FileData *basefd, ListBase *mainlist)
   BLO_main_expander(expand_doit_library);
 
   /* At this point the base blend file has been read, and each library blend
-   * encountered so far has a main with placeholders for linked datablocks.
+   * encountered so far has a main with placeholders for linked data-blocks.
    *
    * Now we will read the library blend files and replace the placeholders
-   * with actual datablocks. We loop over library mains multiple times in
-   * case a library needs to link additional datablocks from another library
+   * with actual data-blocks. We loop over library mains multiple times in
+   * case a library needs to link additional data-blocks from another library
    * that had been read previously. */
   while (do_it) {
     do_it = false;
@@ -11797,10 +11797,10 @@ static void read_libraries(FileData *basefd, ListBase *mainlist)
     /* Loop over mains of all library blend files encountered so far. Note
      * this list gets longer as more indirectly library blends are found. */
     for (Main *mainptr = mainl->next; mainptr; mainptr = mainptr->next) {
-      /* Does this library have any more linked datablocks we need to read? */
+      /* Does this library have any more linked data-blocks we need to read? */
       if (has_linked_ids_to_read(mainptr)) {
 #if 0
-        printf("Reading linked datablocks from %s (%s)\n",
+        printf("Reading linked data-blocks from %s (%s)\n",
                mainptr->curlib->id.name,
                mainptr->curlib->name);
 #endif
diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index 4adbbac8cae..9d9906fc3e0 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -1198,7 +1198,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain)
     for (bGPdata *gpd = bmain->gpencils.first; gpd; gpd = gpd->id.next) {
       bool enabled = false;
 
-      /* Ensure that the datablock's onionskinning toggle flag
+      /* Ensure that the datablock's onion-skinning toggle flag
        * stays in sync with the status of the actual layers
        */
       for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) {
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 8d0c41674e0..b11de24ad67 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -784,7 +784,7 @@ void do_versions_after_linking_280(Main *bmain)
     }
 
     /* We need to assign lib pointer to generated hidden collections *after* all have been created,
-     * otherwise we'll end up with several datablocks sharing same name/library,
+     * otherwise we'll end up with several data-blocks sharing same name/library,
      * which is FORBIDDEN!
      * Note: we need this to be recursive,
      * since a child collection may be sorted before its parent in bmain. */
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 8d83be47f63..04fdd797b2c 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -35,7 +35,7 @@
  *                     _ = 4 byte pointer, - = 8 byte pointer
  * </pre>
  *
- * datablocks: (also see struct #BHead).
+ * data-blocks: (also see struct #BHead).
  * <pre>
  *     <bh.code>           4 chars
  *     <bh.len>            int,  len data after BHead
@@ -2354,7 +2354,7 @@ static void write_light(WriteData *wd, Light *la)
 
 static void write_collection_nolib(WriteData *wd, Collection *collection)
 {
-  /* Shared function for collection datablocks and scene master collection. */
+  /* Shared function for collection data-blocks and scene master collection. */
   write_previews(wd, collection->preview);
 
   for (CollectionObject *cob = collection->gobject.first; cob; cob = cob->next) {
@@ -3779,7 +3779,7 @@ static bool write_file_handle(Main *mainvar,
                                                 NULL :
                                                 BKE_override_static_operations_store_initialize();
 
-  /* This outer loop allows to save first datablocks from real mainvar,
+  /* This outer loop allows to save first data-blocks from real mainvar,
    * then the temp ones from override process,
    * if needed, without duplicating whole code. */
   Main *bmain = mainvar;