[Bf-blender-cvs] [fc08fe82ae5] master: Cleanup: spelling
Campbell Barton
noreply at git.blender.org
Mon Mar 1 01:01:46 CET 2021
Commit: fc08fe82ae5da2c4675ac6a6c1707dce28324d26
Author: Campbell Barton
Date: Mon Mar 1 11:00:22 2021 +1100
Branches: master
https://developer.blender.org/rBfc08fe82ae5da2c4675ac6a6c1707dce28324d26
Cleanup: spelling
===================================================================
M intern/ghost/intern/GHOST_ImeWin32.h
M source/blender/blenkernel/intern/lib_query.c
M source/blender/bmesh/operators/bmo_primitive.c
M source/blender/depsgraph/intern/depsgraph_query_iter.cc
M source/blender/depsgraph/intern/depsgraph_tag.cc
===================================================================
diff --git a/intern/ghost/intern/GHOST_ImeWin32.h b/intern/ghost/intern/GHOST_ImeWin32.h
index cd13ee1a8ae..0c851e067e8 100644
--- a/intern/ghost/intern/GHOST_ImeWin32.h
+++ b/intern/ghost/intern/GHOST_ImeWin32.h
@@ -296,7 +296,7 @@ class GHOST_ImeWin32 {
* Disable the IME attached to the given window, i.e. prohibits any user-input
* events from being dispatched to the IME.
* In Chrome, this function is used when:
- * * a rendeder process sets its input focus to a password input.
+ * * a renderer process sets its input focus to a password input.
* Parameters
* * window_handle [in] (HWND)
* Represents the window handle of the caller.
diff --git a/source/blender/blenkernel/intern/lib_query.c b/source/blender/blenkernel/intern/lib_query.c
index eaf1e2d46e6..796bc3dc3d0 100644
--- a/source/blender/blenkernel/intern/lib_query.c
+++ b/source/blender/blenkernel/intern/lib_query.c
@@ -46,7 +46,7 @@ enum {
typedef struct LibraryForeachIDData {
Main *bmain;
/**
- * 'Real' ID, the one that might be in bmain, only differs from self_id when the later is a
+ * 'Real' ID, the one that might be in `bmain`, only differs from self_id when the later is a
* private one.
*/
ID *owner_id;
@@ -137,7 +137,7 @@ void BKE_lib_query_idpropertiesForeachIDLink_callback(IDProperty *id_prop, void
bool BKE_library_foreach_ID_embedded(LibraryForeachIDData *data, ID **id_pp)
{
- /* Needed e.g. for callbacks handling relationships... This call shall be absolutely readonly. */
+ /* Needed e.g. for callbacks handling relationships. This call shall be absolutely read-only. */
ID *id = *id_pp;
const int flag = data->flag;
@@ -215,7 +215,7 @@ static void library_foreach_ID_link(Main *bmain,
data.self_id;
/* inherit_data is non-NULL when this function is called for some sub-data ID
- * (like root nodetree of a material).
+ * (like root node-tree of a material).
* In that case, we do not want to generate those 'generic flags' from our current sub-data ID
* (the node tree), but re-use those generated for the 'owner' ID (the material). */
if (inherit_data == NULL) {
@@ -632,7 +632,7 @@ static void lib_query_unused_ids_tag_recurse(Main *bmain,
if (ELEM(GS(id->name), ID_WM, ID_WS, ID_SCE, ID_SCR, ID_LI)) {
/* Some 'root' ID types are never unused (even though they may not have actual users), unless
- * their actual usercount is set to 0. */
+ * their actual user-count is set to 0. */
return;
}
@@ -683,7 +683,7 @@ static void lib_query_unused_ids_tag_recurse(Main *bmain,
*
* By default only tag IDs with `0` user count.
* If `do_tag_recursive` is set, it will check dependencies to detect all IDs that are not actually
- * used in current file, including 'archipelagoes` (i.e. set of IDs referencing each other in
+ * used in current file, including 'archipelagos` (i.e. set of IDs referencing each other in
* loops, but without any 'external' valid usages.
*
* Valid usages here are defined as ref-counting usages, which are not towards embedded or
@@ -700,7 +700,7 @@ void BKE_lib_query_unused_ids_tag(Main *bmain,
const bool do_tag_recursive,
int *r_num_tagged)
{
- /* First loop, to only check for immediatly unused IDs (those with 0 user count).
+ /* First loop, to only check for immediately unused IDs (those with 0 user count).
* NOTE: It also takes care of clearing given tag for used IDs. */
ID *id;
FOREACH_MAIN_ID_BEGIN (bmain, id) {
diff --git a/source/blender/bmesh/operators/bmo_primitive.c b/source/blender/bmesh/operators/bmo_primitive.c
index 7d980299771..535df52c1e1 100644
--- a/source/blender/bmesh/operators/bmo_primitive.c
+++ b/source/blender/bmesh/operators/bmo_primitive.c
@@ -924,7 +924,7 @@ void bmo_create_uvsphere_exec(BMesh *bm, BMOperator *op)
len = 2 * dia * sinf(phid / 2.0f);
- /* length of one segment in shortest parallen */
+ /* Length of one segment in shortest parallel. */
vec[0] = dia * sinf(phid);
vec[1] = 0.0f;
vec[2] = dia * cosf(phid);
diff --git a/source/blender/depsgraph/intern/depsgraph_query_iter.cc b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
index 34465c12914..ed002321729 100644
--- a/source/blender/depsgraph/intern/depsgraph_query_iter.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
@@ -86,7 +86,7 @@ void verify_id_properties_freed(DEGObjectIterData *data)
const Object *dupli_object = data->dupli_object_current->ob;
Object *temp_dupli_object = &data->temp_dupli_object;
if (temp_dupli_object->id.properties == nullptr) {
- // No ID properties in temp datablock -- no leak is possible.
+ // No ID properties in temp data-block -- no leak is possible.
return;
}
if (temp_dupli_object->id.properties == dupli_object->id.properties) {
@@ -435,7 +435,7 @@ static void DEG_iterator_ids_step(BLI_Iterator *iter, deg::IDNode *id_node, bool
if (only_updated && !(id_cow->recalc & ID_RECALC_ALL)) {
bNodeTree *ntree = ntreeFromID(id_cow);
- /* Nodetree is considered part of the datablock. */
+ /* Node-tree is considered part of the data-block. */
if (!(ntree && (ntree->id.recalc & ID_RECALC_ALL))) {
iter->skip = true;
return;
diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc
index c60ec4351bc..2051ee3657a 100644
--- a/source/blender/depsgraph/intern/depsgraph_tag.cc
+++ b/source/blender/depsgraph/intern/depsgraph_tag.cc
@@ -253,7 +253,7 @@ void depsgraph_update_editors_tag(Main *bmain, Depsgraph *graph, ID *id)
{
/* NOTE: We handle this immediately, without delaying anything, to be
* sure we don't cause threading issues with OpenGL. */
- /* TODO(sergey): Make sure this works for CoW-ed datablocks as well. */
+ /* TODO(sergey): Make sure this works for CoW-ed data-blocks as well. */
DEGEditorUpdateContext update_ctx = {nullptr};
update_ctx.bmain = bmain;
update_ctx.depsgraph = (::Depsgraph *)graph;
@@ -306,7 +306,7 @@ void depsgraph_tag_component(Depsgraph *graph,
/* This is a tag compatibility with legacy code.
*
* Mainly, old code was tagging object with ID_RECALC_GEOMETRY tag to inform
- * that object's data datablock changed. Now API expects that ID is given
+ * that object's data data-block changed. Now API expects that ID is given
* explicitly, but not all areas are aware of this yet. */
void deg_graph_id_tag_legacy_compat(
Main *bmain, Depsgraph *depsgraph, ID *id, IDRecalcFlag tag, eUpdateSource update_source)
@@ -667,7 +667,7 @@ void graph_id_tag_update(
IDRecalcFlag tag = (IDRecalcFlag)(1 << bitscan_forward_clear_i(¤t_flag));
graph_id_tag_update_single_flag(bmain, graph, id, id_node, tag, update_source);
}
- /* Special case for nested node tree datablocks. */
+ /* Special case for nested node tree data-blocks. */
id_tag_update_ntree_special(bmain, graph, id, flag, update_source);
/* Direct update tags means that something outside of simulated/cached
* physics did change and that cache is to be invalidated.
@@ -777,12 +777,12 @@ void DEG_graph_time_tag_update(struct Depsgraph *depsgraph)
deg_graph->tag_time_source();
}
-/* Mark a particular datablock type as having changing. */
+/* Mark a particular data-block type as having changing. */
void DEG_graph_id_type_tag(Depsgraph *depsgraph, short id_type)
{
if (id_type == ID_NT) {
- /* Stupid workaround so parent datablocks of nested nodetree get looped
- * over when we loop over tagged datablock types. */
+ /* Stupid workaround so parent data-blocks of nested node-tree get looped
+ * over when we loop over tagged data-block types. */
DEG_graph_id_type_tag(depsgraph, ID_MA);
DEG_graph_id_type_tag(depsgraph, ID_TE);
DEG_graph_id_type_tag(depsgraph, ID_LA);
More information about the Bf-blender-cvs
mailing list