From 4e45265dc6cafe0bf6f36a14a469288183059858 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 30 Nov 2021 09:04:50 +1100 Subject: Cleanup: spelling in comments & strings --- .../blender/blenkernel/BKE_blendfile_link_append.h | 6 +++--- source/blender/blenkernel/BKE_bpath.h | 8 ++++---- source/blender/blenkernel/BKE_modifier.h | 2 +- .../blenkernel/intern/blendfile_link_append.c | 24 +++++++++++----------- source/blender/blenkernel/intern/image.c | 2 +- source/blender/blenkernel/intern/lib_id.c | 2 +- source/blender/blenkernel/intern/scene.c | 2 +- 7 files changed, 23 insertions(+), 23 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/BKE_blendfile_link_append.h b/source/blender/blenkernel/BKE_blendfile_link_append.h index 9e4a498f5e7..cda6a620326 100644 --- a/source/blender/blenkernel/BKE_blendfile_link_append.h +++ b/source/blender/blenkernel/BKE_blendfile_link_append.h @@ -72,13 +72,13 @@ short BKE_blendfile_link_append_context_item_idcode_get( struct BlendfileLinkAppendContext *lapp_context, struct BlendfileLinkAppendContextItem *item); typedef enum eBlendfileLinkAppendForeachItemFlag { - /** Loop over directly linked items (i.e. those explicitely defined by user code). */ + /** Loop over directly linked items (i.e. those explicitly defined by user code). */ BKE_BLENDFILE_LINK_APPEND_FOREACH_ITEM_FLAG_DO_DIRECT = 1 << 0, /** Loop over indirectly linked items (i.e. those defined by internal code, as dependencies of * direct ones). * - * IMPORTANT: Those 'indirect' items currently may not cover **all** indrectly linked data. See - * comments in #foreach_libblock_link_append_callback. */ + * IMPORTANT: Those 'indirect' items currently may not cover **all** indirectly linked data. + * See comments in #foreach_libblock_link_append_callback. */ BKE_BLENDFILE_LINK_APPEND_FOREACH_ITEM_FLAG_DO_INDIRECT = 1 << 0, } eBlendfileLinkAppendForeachItemFlag; /** Callback called by #BKE_blendfile_link_append_context_item_foreach over each (or a subset of diff --git a/source/blender/blenkernel/BKE_bpath.h b/source/blender/blenkernel/BKE_bpath.h index 984c7f609f6..338aec4ae4f 100644 --- a/source/blender/blenkernel/BKE_bpath.h +++ b/source/blender/blenkernel/BKE_bpath.h @@ -22,7 +22,7 @@ */ /* TODO: Make this module handle a bit more safely string length, instead of assuming buffers are - * FILE_MAX len etc. */ + * FILE_MAX length etc. */ #pragma once @@ -54,13 +54,13 @@ typedef enum eBPathForeachFlag { * `foreach_path` implementations and/or callbacks to implement specific behaviors. */ /** Skip paths where a single dir is used with an array of files, eg. sequence strip images or - * pointcaches. In this case only use the first file path is processed. + * point-caches. In this case only use the first file path is processed. * * This is needed for directory manipulation callbacks which might otherwise modify the same * directory multiple times. */ BKE_BPATH_FOREACH_PATH_SKIP_MULTIFILE = (1 << 8), /** Reload data (when the path is edited). - * \note Ony used by Image IDType currently. */ + * \note Only used by Image IDType currently. */ BKE_BPATH_FOREACH_PATH_RELOAD_EDITED = (1 << 9), } eBPathForeachFlag; @@ -76,7 +76,7 @@ typedef bool (*BPathForeachPathFunctionCallback)(struct BPathForeachPathData *bp char *r_path_dst, const char *path_src); -/** Storage for common data needed accross the BPath 'foreach_path' code. */ +/** Storage for common data needed across the BPath 'foreach_path' code. */ typedef struct BPathForeachPathData { struct Main *bmain; diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h index 8be563e4c96..eca6bc38da6 100644 --- a/source/blender/blenkernel/BKE_modifier.h +++ b/source/blender/blenkernel/BKE_modifier.h @@ -98,7 +98,7 @@ typedef enum { eModifierTypeFlag_RequiresOriginalData = (1 << 5), /** - * For modifiers that support pointcache, + * For modifiers that support point-cache, * so we can check to see if it has files we need to deal with. */ eModifierTypeFlag_UsesPointCache = (1 << 6), diff --git a/source/blender/blenkernel/intern/blendfile_link_append.c b/source/blender/blenkernel/intern/blendfile_link_append.c index fb961dba482..17c44bbd5f5 100644 --- a/source/blender/blenkernel/intern/blendfile_link_append.c +++ b/source/blender/blenkernel/intern/blendfile_link_append.c @@ -18,8 +18,8 @@ * \ingroup bke * * High level `.blend` file link/append code, - * including linking/appending several IDs from different libraries, handling instanciations of - * collections/objects/obdata in current scene. + * including linking/appending several IDs from different libraries, handling instantiations of + * collections/objects/object-data in current scene. */ #include @@ -110,7 +110,7 @@ typedef struct BlendfileLinkAppendContext { LinkNodePair items; int num_libraries; int num_items; - /** Linking/appending parameters. Including bmain, scene, viewlayer and view3d. */ + /** Linking/appending parameters. Including `bmain`, `scene`, `viewlayer` and `view3d`. */ LibraryLink_Params *params; /** Allows to easily find an existing items from an ID pointer. */ @@ -245,7 +245,7 @@ void BKE_blendfile_link_append_context_embedded_blendfile_set( BlendfileLinkAppendContext *lapp_context, const void *blendfile_mem, int blendfile_memsize) { BLI_assert_msg(lapp_context->blendfile_mem == NULL, - "Please explicitely clear reference to an embedded blender memfile before " + "Please explicitly clear reference to an embedded blender memfile before " "setting a new one"); lapp_context->blendfile_mem = blendfile_mem; lapp_context->blendfile_memsize = (size_t)blendfile_memsize; @@ -530,7 +530,7 @@ static void loose_data_instantiate_object_base_instance_init(Main *bmain, } /* Tag obdata that actually need to be instantiated (those referenced by an object do not, since - * the object will be instantiated instaed if needed. */ + * the object will be instantiated instead if needed. */ static void loose_data_instantiate_obdata_preprocess( LooseDataInstantiateContext *instantiate_context) { @@ -854,7 +854,7 @@ static int foreach_libblock_link_append_callback(LibraryIDLinkCallbackData *cb_d * processed, so we need to recursively deal with them here. */ /* NOTE: Since we are by-passing checks in `BKE_library_foreach_ID_link` by manually calling it * recursively, we need to take care of potential recursion cases ourselves (e.g.animdata of - * shapekey referencing the shapekey itself). */ + * shape-key referencing the shape-key itself). */ if (id != cb_data->id_self) { BKE_library_foreach_ID_link( cb_data->bmain, id, foreach_libblock_link_append_callback, data, IDWALK_NOP); @@ -946,8 +946,8 @@ void BKE_blendfile_append(BlendfileLinkAppendContext *lapp_context, ReportList * /* Linked IDs should never be marked as needing post-processing (instantiation of loose * objects etc.). - * NOTE: This is dev test check, can be removed once we get rid of instantiation code in BLO - * completely.*/ + * NOTE: This is a developer test check, can be removed once we get rid of instantiation code + * in BLO completely.*/ BLI_assert((id->tag & LIB_TAG_DOIT) == 0); ID *existing_local_id = BKE_idtype_idcode_append_is_reusable(GS(id->name)) ? @@ -1206,8 +1206,8 @@ void BKE_blendfile_link(BlendfileLinkAppendContext *lapp_context, ReportList *re /* here appending/linking starts */ - /* NOTE: This is temporary hotfix until whole code using link/append features has been moved to - * use new BKE code. */ + /* NOTE: This is temporary hot-fix until whole code using link/append features has been moved + * to use new BKE code. */ /* Do not handle instantiation in linking process anymore, we do it here in * #loose_data_instantiate instead. */ lapp_context->params->flag &= ~BLO_LIBLINK_NEEDS_ID_TAG_DOIT; @@ -1271,8 +1271,8 @@ void BKE_blendfile_link(BlendfileLinkAppendContext *lapp_context, ReportList *re /* Linked IDs should never be marked as needing post-processing (instantiation of loose * objects etc.). - * NOTE: This is dev test check, can be removed once we get rid of instantiation code in BLO - * completely.*/ + * NOTE: This is developer test check, can be removed once we get rid of instantiation code + * in BLO completely.*/ BLI_assert((id->tag & LIB_TAG_DOIT) == 0); BlendfileLinkAppendContextCallBack cb_data = { diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 295157abe9a..6fe415aedab 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -264,7 +264,7 @@ static void image_foreach_path(ID *id, BPathForeachPathData *bpath_data) /* Skip empty file paths, these are typically from generated images and * don't make sense to add directories to until the image has been saved * once to give it a meaningful value. */ - /* TODO re-assess whether this behavior is disired in the new generic code context. */ + /* TODO re-assess whether this behavior is desired in the new generic code context. */ if (!ELEM(ima->source, IMA_SRC_FILE, IMA_SRC_MOVIE, IMA_SRC_SEQUENCE, IMA_SRC_TILED) || ima->filepath[0] == '\0') { return; diff --git a/source/blender/blenkernel/intern/lib_id.c b/source/blender/blenkernel/intern/lib_id.c index 58c909d0cd6..c53fed4ba4c 100644 --- a/source/blender/blenkernel/intern/lib_id.c +++ b/source/blender/blenkernel/intern/lib_id.c @@ -1854,7 +1854,7 @@ bool BKE_id_new_name_validate(ListBase *lb, ID *id, const char *tname, const boo return result; } -/* next to indirect usage in read/writefile also in editobject.c scene.c */ +/* Next to indirect usage in `readfile.c/writefile.c` also in `editobject.c`, `scene.c`. */ void BKE_main_id_newptr_and_tag_clear(Main *bmain) { ID *id; diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 31e1ca464fc..f2ac6b7fd22 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -902,7 +902,7 @@ static bool seq_foreach_path_callback(Sequence *seq, void *user_data) BKE_bpath_foreach_path_dirfile_fixed_process(bpath_data, seq->strip->dir, se->name); } else if ((seq->type == SEQ_TYPE_IMAGE) && se) { - /* NOTE: An option not to loop over all strips could be usefull? */ + /* NOTE: An option not to loop over all strips could be useful? */ unsigned int len = (unsigned int)MEM_allocN_len(se) / (unsigned int)sizeof(*se); unsigned int i; -- cgit v1.2.3