[Bf-blender-cvs] [1829232598e] master: Cleanup: spelling in comments & some minor clarifications
Campbell Barton
noreply at git.blender.org
Thu Mar 10 06:29:28 CET 2022
Commit: 1829232598e6e94e6b0735d86ae8ea34a4bff0c8
Author: Campbell Barton
Date: Thu Mar 10 11:32:48 2022 +1100
Branches: master
https://developer.blender.org/rB1829232598e6e94e6b0735d86ae8ea34a4bff0c8
Cleanup: spelling in comments & some minor clarifications
===================================================================
M intern/cycles/scene/mesh.cpp
M source/blender/blenkernel/BKE_geometry_set.hh
M source/blender/blenkernel/BKE_lib_id.h
M source/blender/blenkernel/intern/blendfile_link_append.c
M source/blender/blenkernel/intern/data_transfer.c
M source/blender/blenkernel/intern/image.cc
M source/blender/blenkernel/intern/key.c
M source/blender/blenkernel/intern/lib_id.c
M source/blender/blenkernel/intern/lib_override.c
M source/blender/blenkernel/intern/screen.c
M source/blender/blenkernel/intern/sound.c
M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M source/blender/depsgraph/intern/depsgraph_tag.cc
M source/blender/draw/intern/draw_common.c
M source/blender/editors/animation/anim_channels_defines.c
M source/blender/editors/animation/keyframing.c
M source/blender/editors/include/ED_screen_types.h
M source/blender/editors/include/ED_view3d.h
M source/blender/editors/mask/mask_edit.c
M source/blender/editors/mask/mask_editaction.c
M source/blender/editors/mesh/meshtools.c
M source/blender/editors/space_node/node_draw.cc
M source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.h
M source/blender/ikplugin/intern/iksolver_plugin.c
M source/blender/io/collada/AnimationImporter.cpp
M source/blender/makesdna/DNA_ID.h
M source/blender/makesdna/DNA_action_types.h
M source/blender/makesrna/intern/rna_key.c
M source/blender/modifiers/intern/MOD_ui_common.h
M source/blender/python/intern/bpy_rna.c
M source/blender/windowmanager/WM_api.h
===================================================================
diff --git a/intern/cycles/scene/mesh.cpp b/intern/cycles/scene/mesh.cpp
index ebf1c3999b6..a459195efee 100644
--- a/intern/cycles/scene/mesh.cpp
+++ b/intern/cycles/scene/mesh.cpp
@@ -68,7 +68,7 @@ void Mesh::Triangle::verts_for_step(const float3 *verts,
r_verts[2] = verts[v[2]];
}
else {
- /* Center step not stored in the attribute array array. */
+ /* Center step not stored in the attribute array. */
if (step > center_step) {
step--;
}
diff --git a/source/blender/blenkernel/BKE_geometry_set.hh b/source/blender/blenkernel/BKE_geometry_set.hh
index 169554b4453..0e121068cbc 100644
--- a/source/blender/blenkernel/BKE_geometry_set.hh
+++ b/source/blender/blenkernel/BKE_geometry_set.hh
@@ -678,7 +678,7 @@ class CurveComponentLegacy : public GeometryComponent {
};
/**
- * A geometry component that stores a group of curves, corresponding the the #Curves and
+ * A geometry component that stores a group of curves, corresponding the #Curves and
* #CurvesGeometry types.
*/
class CurveComponent : public GeometryComponent {
diff --git a/source/blender/blenkernel/BKE_lib_id.h b/source/blender/blenkernel/BKE_lib_id.h
index c56cb616a9a..040be8d1280 100644
--- a/source/blender/blenkernel/BKE_lib_id.h
+++ b/source/blender/blenkernel/BKE_lib_id.h
@@ -150,11 +150,11 @@ enum {
LIB_ID_COPY_NO_PREVIEW = 1 << 17,
/** Copy runtime data caches. */
LIB_ID_COPY_CACHES = 1 << 18,
- /** Don't copy id->adt, used by ID datablock localization routines. */
+ /** Don't copy id->adt, used by ID data-block localization routines. */
LIB_ID_COPY_NO_ANIMDATA = 1 << 19,
/** Mesh: Reference CD data layers instead of doing real copy - USE WITH CAUTION! */
LIB_ID_COPY_CD_REFERENCE = 1 << 20,
- /** Do not copy id->override_library, used by ID datablock override routines. */
+ /** Do not copy id->override_library, used by ID data-block override routines. */
LIB_ID_COPY_NO_LIB_OVERRIDE = 1 << 21,
/** When copying local sub-data (like constraints or modifiers), do not set their "library
* override local data" flag. */
@@ -162,11 +162,11 @@ enum {
/* *** XXX Hackish/not-so-nice specific behaviors needed for some corner cases. *** */
/* *** Ideally we should not have those, but we need them for now... *** */
- /** EXCEPTION! Deep-copy actions used by animdata of copied ID. */
+ /** EXCEPTION! Deep-copy actions used by animation-data of copied ID. */
LIB_ID_COPY_ACTIONS = 1 << 24,
- /** Keep the library pointer when copying datablock outside of bmain. */
+ /** Keep the library pointer when copying data-block outside of bmain. */
LIB_ID_COPY_KEEP_LIB = 1 << 25,
- /** EXCEPTION! Deep-copy shapekeys used by copied obdata ID. */
+ /** EXCEPTION! Deep-copy shape-keys used by copied obdata ID. */
LIB_ID_COPY_SHAPEKEY = 1 << 26,
/** EXCEPTION! Specific deep-copy of node trees used e.g. for rendering purposes. */
LIB_ID_COPY_NODETREE_LOCALIZE = 1 << 27,
@@ -177,7 +177,7 @@ enum {
LIB_ID_COPY_RIGID_BODY_NO_COLLECTION_HANDLING = 1 << 28,
/* *** Helper 'defines' gathering most common flag sets. *** */
- /** Shapekeys are not real ID's, more like local data to geometry IDs... */
+ /** Shape-keys are not real ID's, more like local data to geometry IDs. */
LIB_ID_COPY_DEFAULT = LIB_ID_COPY_SHAPEKEY,
/** Create a local, outside of bmain, data-block to work on. */
@@ -412,7 +412,7 @@ struct ID *BKE_id_copy(struct Main *bmain, const struct ID *id);
*
* There are exceptions though:
* - Embedded IDs (root node trees and master collections) are always copied with their owner.
- * - If #LIB_ID_COPY_ACTIONS is defined, actions used by animdata will be duplicated.
+ * - If #LIB_ID_COPY_ACTIONS is defined, actions used by anim-data will be duplicated.
* - If #LIB_ID_COPY_SHAPEKEY is defined, shape-keys will be duplicated.
* - If #LIB_ID_CREATE_LOCAL is defined, root node trees will be deep-duplicated recursively.
*
diff --git a/source/blender/blenkernel/intern/blendfile_link_append.c b/source/blender/blenkernel/intern/blendfile_link_append.c
index ce36bfe81be..294fe57c923 100644
--- a/source/blender/blenkernel/intern/blendfile_link_append.c
+++ b/source/blender/blenkernel/intern/blendfile_link_append.c
@@ -926,7 +926,7 @@ static int foreach_libblock_link_append_callback(LibraryIDLinkCallbackData *cb_d
* unfortunately they can use fully linkable valid IDs too, like actions. Those need to be
* 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
+ * recursively, we need to take care of potential recursion cases ourselves (e.g.anim-data of
* shape-key referencing the shape-key itself).
* NOTE: in case both IDs (owner and 'used' ones) are non-linkable, we can assume we can break
* the dependency here. Indeed, either they are both linked in another way (through their own
diff --git a/source/blender/blenkernel/intern/data_transfer.c b/source/blender/blenkernel/intern/data_transfer.c
index 1818e5a9490..5be993ca1f7 100644
--- a/source/blender/blenkernel/intern/data_transfer.c
+++ b/source/blender/blenkernel/intern/data_transfer.c
@@ -973,8 +973,8 @@ static bool data_transfer_layersmapping_generate(ListBase *r_map,
return ret;
}
if (cddata_type == CD_FAKE_SHAPEKEY) {
- /* TODO: leaving shapekeys aside for now, quite specific case,
- * since we can't access them from MVert :/ */
+ /* TODO: leaving shape-keys aside for now, quite specific case,
+ * since we can't access them from #MVert :/ */
return false;
}
}
diff --git a/source/blender/blenkernel/intern/image.cc b/source/blender/blenkernel/intern/image.cc
index 967f0f61e07..ff10f36cc22 100644
--- a/source/blender/blenkernel/intern/image.cc
+++ b/source/blender/blenkernel/intern/image.cc
@@ -198,7 +198,7 @@ static void image_free_data(ID *id)
{
Image *image = (Image *)id;
- /* Also frees animdata. */
+ /* Also frees animations (#Image.anims list). */
BKE_image_free_buffers(image);
image_free_packedfiles(image);
diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c
index e28094c0abc..bd6ffa2bc55 100644
--- a/source/blender/blenkernel/intern/key.c
+++ b/source/blender/blenkernel/intern/key.c
@@ -206,7 +206,7 @@ IDTypeInfo IDType_ID_KE = {
.foreach_id = shapekey_foreach_id,
.foreach_cache = NULL,
.foreach_path = NULL,
- /* A bit weird, due to shapekeys not being strictly speaking embedded data... But they also
+ /* A bit weird, due to shape-keys not being strictly speaking embedded data... But they also
* share a lot with those (non linkable, only ever used by one owner ID, etc.). */
.owner_get = shapekey_owner_get,
diff --git a/source/blender/blenkernel/intern/lib_id.c b/source/blender/blenkernel/intern/lib_id.c
index 7cd3204f3f1..28745f1d2c7 100644
--- a/source/blender/blenkernel/intern/lib_id.c
+++ b/source/blender/blenkernel/intern/lib_id.c
@@ -1875,7 +1875,7 @@ void BKE_library_make_local(Main *bmain,
for (int a = set_listbasepointers(bmain, lbarray); a--;) {
ID *id = lbarray[a]->first;
- /* Do not explicitly make local non-linkable IDs (shapekeys, in fact),
+ /* Do not explicitly make local non-linkable IDs (shape-keys, in fact),
* they are assumed to be handled by real data-blocks responsible of them. */
const bool do_skip = (id && !BKE_idtype_idcode_is_linkable(GS(id->name)));
@@ -1902,8 +1902,8 @@ void BKE_library_make_local(Main *bmain,
* to discover all your links are lost after appending).
* Also, never ever make proxified objects local, would not make any sense. */
/* Some more notes:
- * - Shapekeys are never tagged here (since they are not linkable).
- * - Nodetrees used in materials etc. have to be tagged manually,
+ * - Shape-keys are never tagged here (since they are not linkable).
+ * - Node-trees used in materials etc. have to be tagged manually,
* since they do not exist in Main (!).
* This is ok-ish on 'make local' side of things
* (since those are handled by their 'owner' IDs),
diff --git a/source/blender/blenkernel/intern/lib_override.c b/source/blender/blenkernel/intern/lib_override.c
index 9b7f9d4f36d..7f34ccfc36f 100644
--- a/source/blender/blenkernel/intern/lib_override.c
+++ b/source/blender/blenkernel/intern/lib_override.c
@@ -3420,7 +3420,7 @@ ID *BKE_lib_override_library_operations_store_start(Main *bmain,
{
if (ID_IS_OVERRIDE_LIBRARY_TEMPLATE(local) || ID_IS_OVERRIDE_LIBRARY_VIRTUAL(local)) {
/* This is actually purely local data with an override template, or one of those embedded IDs
- * (root node trees, master collections or shapekeys) that cannot have their own override.
+ * (root node trees, master collections or shape-keys) that cannot have their own override.
* Nothing to do here! */
return NULL;
}
diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c
index b1b9a24ebaa..ebc87c6ccc0 100644
--- a/source/blender/blenkernel/intern/screen.c
+++ b/source/blender/blenkernel/intern/screen.c
@@ -58,7 +58,7 @@ static void screen_free_data(ID *id)
{
bScreen *screen = (bScreen *)id;
- /* No animdata here. */
+ /* No animation-data here. */
LISTBASE_FOREACH (ARegion *, region, &screen->regionbase) {
BKE_area_region_free(NULL, region);
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index 8b72fd05057..b991805fae8 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -87,7 +87,7 @@ static void sound_free_data(ID *id)
{
bSound *sound = (bSound *)id;
- /* No animdata here. */
+ /* No animation-data here. */
if (sound->packedfile) {
BKE_packedfile_free(sound->packedfile);
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 77597e0db06..49e850b
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list