[Bf-blender-cvs] [bc2220733ae] master: Cleanup: spelling in comments
Campbell Barton
noreply at git.blender.org
Tue Jan 3 01:40:25 CET 2023
Commit: bc2220733aeeaeeaa3e767511ed19ba00c4834ef
Author: Campbell Barton
Date: Tue Jan 3 10:19:27 2023 +1100
Branches: master
https://developer.blender.org/rBbc2220733aeeaeeaa3e767511ed19ba00c4834ef
Cleanup: spelling in comments
===================================================================
M source/blender/blenkernel/intern/action.c
M source/blender/blenkernel/intern/blendfile.c
M source/blender/blenkernel/intern/context.cc
M source/blender/blenkernel/intern/lib_id.c
M source/blender/blenkernel/intern/lib_query.c
M source/blender/blenkernel/intern/mesh_convert.cc
M source/blender/blenkernel/intern/node.cc
M source/blender/editors/sculpt_paint/paint_intern.h
M source/blender/gpu/intern/gpu_context.cc
M source/blender/gpu/metal/mtl_shader_interface.mm
M source/blender/makesdna/DNA_ID.h
M source/blender/makesrna/intern/rna_fcurve.c
M source/blender/makesrna/intern/rna_mask.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/nodes/composite/nodes/node_composite_glare.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c
index 8f6bd812d8e..dcd0c25967b 100644
--- a/source/blender/blenkernel/intern/action.c
+++ b/source/blender/blenkernel/intern/action.c
@@ -108,7 +108,7 @@ static void action_copy_data(Main *UNUSED(bmain), ID *id_dst, const ID *id_src,
/* Duplicate F-Curve. */
/* XXX TODO: pass subdata flag?
- * But surprisingly does not seem to be doing any ID refcounting... */
+ * But surprisingly does not seem to be doing any ID reference-counting. */
fcurve_dst = BKE_fcurve_copy(fcurve_src);
BLI_addtail(&action_dst->curves, fcurve_dst);
diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c
index 7aa3fd4b9c5..f4421fc0d1c 100644
--- a/source/blender/blenkernel/intern/blendfile.c
+++ b/source/blender/blenkernel/intern/blendfile.c
@@ -416,9 +416,9 @@ static void setup_app_data(bContext *C,
* 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
- * refcounting.
- * Now that we re-use (and do not liblink in readfile.c) most local datablocks as well, we have
- * to recompute refcount for all local IDs too. */
+ * reference-counting.
+ * Now that we re-use (and do not liblink in readfile.c) most local data-blocks as well,
+ * we have to recompute reference-counts for all local IDs too. */
BKE_main_id_refcount_recompute(bmain, false);
}
diff --git a/source/blender/blenkernel/intern/context.cc b/source/blender/blenkernel/intern/context.cc
index 79f4f56b325..114ed1a49c8 100644
--- a/source/blender/blenkernel/intern/context.cc
+++ b/source/blender/blenkernel/intern/context.cc
@@ -1511,8 +1511,8 @@ Depsgraph *CTX_data_expect_evaluated_depsgraph(const bContext *C)
{
Depsgraph *depsgraph = CTX_data_depsgraph_pointer(C);
/* TODO(sergey): Assert that the dependency graph is fully evaluated.
- * Note that first the depsgraph and scene post-eval hooks needs to run extra round of updates
- * first to make check here really reliable. */
+ * Note that first the depsgraph and scene post-evaluation hooks needs to run extra round of
+ * updates first to make check here really reliable. */
return depsgraph;
}
diff --git a/source/blender/blenkernel/intern/lib_id.c b/source/blender/blenkernel/intern/lib_id.c
index 11ebd4c93c0..fcf585dfcfc 100644
--- a/source/blender/blenkernel/intern/lib_id.c
+++ b/source/blender/blenkernel/intern/lib_id.c
@@ -322,8 +322,8 @@ void id_us_min(ID *id)
if (id->us <= limit) {
if (!ID_TYPE_IS_DEPRECATED(GS(id->name))) {
- /* Do not assert on deprecated ID types, we cannot really ensure that their ID refcounting
- * is valid... */
+ /* Do not assert on deprecated ID types, we cannot really ensure that their ID
+ * reference-counting is valid. */
CLOG_ERROR(&LOG,
"ID user decrement error: %s (from '%s'): %d <= %d",
id->name,
diff --git a/source/blender/blenkernel/intern/lib_query.c b/source/blender/blenkernel/intern/lib_query.c
index e6b3ef97b6e..e655ae88c30 100644
--- a/source/blender/blenkernel/intern/lib_query.c
+++ b/source/blender/blenkernel/intern/lib_query.c
@@ -261,7 +261,7 @@ static bool library_foreach_ID_link(Main *bmain,
* (the node tree), but re-use those generated for the 'owner' ID (the material). */
if (inherit_data == NULL) {
data.cb_flag = ID_IS_LINKED(id) ? IDWALK_CB_INDIRECT_USAGE : 0;
- /* When an ID is defined as not refcounting its ID usages, it should never do it. */
+ /* When an ID is defined as not reference-counting its ID usages, it should never do it. */
data.cb_flag_clear = (id->tag & LIB_TAG_NO_USER_REFCOUNT) ?
IDWALK_CB_USER | IDWALK_CB_USER_ONE :
0;
diff --git a/source/blender/blenkernel/intern/mesh_convert.cc b/source/blender/blenkernel/intern/mesh_convert.cc
index 0a66bacd004..c59210d9d47 100644
--- a/source/blender/blenkernel/intern/mesh_convert.cc
+++ b/source/blender/blenkernel/intern/mesh_convert.cc
@@ -1062,7 +1062,7 @@ Mesh *BKE_mesh_new_from_object_to_bmain(Main *bmain,
* everything is only allowed to reference original data-blocks.
*
* Note that user-count updates has to be done *after* mesh has been transferred to Main database
- * (since doing refcounting on non-Main IDs is forbidden). */
+ * (since doing reference-counting on non-Main IDs is forbidden). */
BKE_library_foreach_ID_link(
nullptr, &mesh->id, foreach_libblock_make_original_callback, nullptr, IDWALK_NOP);
diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index 69d2b2a12e6..ff7e474b36a 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -2955,7 +2955,7 @@ namespace blender::bke {
/**
* Free the node itself.
*
- * \note: ID user refcounting and changing the `nodes_by_id` vector are up to the caller.
+ * \note: ID user reference-counting and changing the `nodes_by_id` vector are up to the caller.
*/
void node_free_node(bNodeTree *ntree, bNode *node)
{
@@ -3031,7 +3031,7 @@ void ntreeFreeLocalNode(bNodeTree *ntree, bNode *node)
void nodeRemoveNode(Main *bmain, bNodeTree *ntree, bNode *node, bool do_id_user)
{
/* This function is not for localized node trees, we do not want
- * do to ID user refcounting and removal of animdation data then. */
+ * do to ID user reference-counting and removal of animdation data then. */
BLI_assert((ntree->id.tag & LIB_TAG_LOCALIZED) == 0);
bool node_has_id = false;
diff --git a/source/blender/editors/sculpt_paint/paint_intern.h b/source/blender/editors/sculpt_paint/paint_intern.h
index a3449e52225..fbb69b1fc5b 100644
--- a/source/blender/editors/sculpt_paint/paint_intern.h
+++ b/source/blender/editors/sculpt_paint/paint_intern.h
@@ -517,7 +517,7 @@ enum eBlurKernelType;
BlurKernel *paint_new_blur_kernel(struct Brush *br, bool proj);
void paint_delete_blur_kernel(BlurKernel *);
-/* Initialize viewport pivot from evaulated bounding box center of ob. */
+/** Initialize viewport pivot from evaluated bounding box center of `ob`. */
void paint_init_pivot(struct Object *ob, struct Scene *scene);
/* paint curve defines */
diff --git a/source/blender/gpu/intern/gpu_context.cc b/source/blender/gpu/intern/gpu_context.cc
index 101542802e6..587e4e74dc6 100644
--- a/source/blender/gpu/intern/gpu_context.cc
+++ b/source/blender/gpu/intern/gpu_context.cc
@@ -262,7 +262,7 @@ bool GPU_backend_type_selection_detect(void)
backends_to_check.append(GPU_BACKEND_OPENGL);
}
- /* Add fallback to OpenGL when Metal backend is requested on a platform that doens't support
+ /* Add fallback to OpenGL when Metal backend is requested on a platform that doesn't support
* metal. */
if (backends_to_check[0] == GPU_BACKEND_METAL) {
backends_to_check.append(GPU_BACKEND_OPENGL);
diff --git a/source/blender/gpu/metal/mtl_shader_interface.mm b/source/blender/gpu/metal/mtl_shader_interface.mm
index 317d0f49763..126279a39a8 100644
--- a/source/blender/gpu/metal/mtl_shader_interface.mm
+++ b/source/blender/gpu/metal/mtl_shader_interface.mm
@@ -286,7 +286,7 @@ void MTLShaderInterface::prepare_common_shader_inputs()
MTLShaderInputAttribute &shd_attr = attributes_[attr_index];
current_input->name_offset = shd_attr.name_offset;
current_input->name_hash = BLI_hash_string(this->get_name_at_offset(shd_attr.name_offset));
- /* For Metal, we flatten the vertex attribute indices within the shader in order to minimise
+ /* For Metal, we flatten the vertex attribute indices within the shader in order to minimize
* complexity. ShaderInput "Location" contains the original attribute location, as can be
* fetched using `GPU_shader_get_attribute_info`. ShaderInput binding contains the array index
* into the MTLShaderInterface `attributes_` array. */
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index 90d44d95139..c416d465ebb 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -812,7 +812,7 @@ enum {
* ID is considered as runtime, and should not be saved when writing .blend file, nor influence
* (in)direct status of linked data.
*
- * Only meaningful for IDs belonging to regular Main database, all other cases are implicitely
+ * Only meaningful for IDs belonging to regular Main database, all other cases are implicitly
* considered runtime-only.
*
* RESET_NEVER
@@ -860,10 +860,10 @@ enum {
/**
* Most of ID tags are cleared on file write (i.e. also when storing undo steps), since they
- * either have of very short lifetime (not expected to exist accross undo steps), or are info that
+ * either have of very short lifetime (not expected to exist across undo steps), or are info that
* will be re-generated when reading undo steps.
*
- * However a few of these need to be explicitely preserved accross undo steps.
+ * However a few of these need to be explicitly preserved across undo steps.
*/
#define LIB_TAG_KEEP_ON_UNDO (LIB_TAG_EXTRAUSER | LIB_TAG_MISSING | LIB_TAG_RUNTIME)
diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c
index 9fe7dda0e20..e19c569bca0 100644
--- a/source/blender/makesrna/intern/rna_fcurve.c
+++ b/source/blender/makesrna/intern/rna_fcurve.c
@@ -267,7 +267,7 @@ static void rna_DriverTarget_update_name(Main *bmain, Scene *scene, PointerRNA *
/* ----------- */
-/* NOTE: this function exists only to avoid id refcounting. */
+/* NOTE: this function exists only to avoid id reference-counting. */
static void rna_DriverTarget_id_set(PointerRNA *ptr,
PointerRNA value,
struct ReportList *UNUSED(reports))
diff --git a/source/blender/makesrna/intern/rna_mask.c b/source/blender/makesrna/intern/rna_mask.c
index 3dd2f5626c0..5b53c3c84
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list