From ad7bb8e42c385f6777e14649bd238de2348ad31b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 22 Mar 2020 12:09:48 +1100 Subject: Cleanup: spelling, correct Mesh.mface docs --- source/blender/editors/animation/keyframing.c | 16 ++++++++-------- source/blender/editors/util/ed_util.c | 2 +- source/blender/io/collada/ArmatureImporter.cpp | 5 +++-- source/blender/io/usd/intern/usd_writer_abstract.h | 2 +- source/blender/makesdna/DNA_layer_types.h | 6 ++++-- source/blender/makesdna/DNA_mesh_types.h | 10 +++++++--- source/blender/makesdna/intern/dna_genfile.c | 2 +- source/blender/makesrna/RNA_types.h | 4 ++-- 8 files changed, 27 insertions(+), 20 deletions(-) (limited to 'source/blender') diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index 96b834492dd..e66ebb1928c 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -2937,10 +2937,10 @@ bool ED_autokeyframe_object(bContext *C, Scene *scene, Object *ob, KeyingSet *ks if (autokeyframe_cfra_can_key(scene, &ob->id)) { ListBase dsources = {NULL, NULL}; - /* now insert the keyframe(s) using the Keying Set - * 1) add datasource override for the Object - * 2) insert keyframes - * 3) free the extra info + /* Now insert the key-frame(s) using the Keying Set: + * 1) Add data-source override for the Object. + * 2) Insert key-frames. + * 3) Free the extra info. */ ANIM_relative_keyingset_add_source(&dsources, &ob->id, NULL, NULL); ANIM_apply_keyingset(C, &dsources, NULL, ks, MODIFYKEY_MODE_INSERT, (float)CFRA); @@ -2959,10 +2959,10 @@ bool ED_autokeyframe_pchan( if (autokeyframe_cfra_can_key(scene, &ob->id)) { ListBase dsources = {NULL, NULL}; - /* now insert the keyframe(s) using the Keying Set - * 1) add datasource override for the PoseChannel - * 2) insert keyframes - * 3) free the extra info + /* Now insert the keyframe(s) using the Keying Set: + * 1) Add data-source override for the pose-channel. + * 2) Insert key-frames. + * 3) Free the extra info. */ ANIM_relative_keyingset_add_source(&dsources, &ob->id, &RNA_PoseBone, pchan); ANIM_apply_keyingset(C, &dsources, NULL, ks, MODIFYKEY_MODE_INSERT, (float)CFRA); diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c index 10b8851f157..fa28d9c2d6d 100644 --- a/source/blender/editors/util/ed_util.c +++ b/source/blender/editors/util/ed_util.c @@ -127,7 +127,7 @@ void ED_editors_init(bContext *C) } else if (ob->type == OB_GPENCIL) { /* For multi-edit mode we may already have mode data (grease pencil does not need it). - * However we may have a non-active object stuck in a greasepencil edit mode. */ + * However we may have a non-active object stuck in a grease-pencil edit mode. */ if (ob != obact) { ob->mode = OB_MODE_OBJECT; DEG_id_tag_update(&ob->id, ID_RECALC_COPY_ON_WRITE); diff --git a/source/blender/io/collada/ArmatureImporter.cpp b/source/blender/io/collada/ArmatureImporter.cpp index ed8984a4239..4e9f31182f1 100644 --- a/source/blender/io/collada/ArmatureImporter.cpp +++ b/source/blender/io/collada/ArmatureImporter.cpp @@ -551,8 +551,8 @@ Object *ArmatureImporter::create_armature_bones(Main *bmain, SkinInfo &skin) */ /** - * Pseudocode: - * + * Pseudo-code: + * 
    * find_node_in_tree(node, root_joint)
    *
    * skin::find_root_joints(root_joints):
@@ -575,6 +575,7 @@ Object *ArmatureImporter::create_armature_bones(Main *bmain, SkinInfo &skin)
    * }
    *
    * endloop:
+   *
*/ SkinInfo *a = &skin; diff --git a/source/blender/io/usd/intern/usd_writer_abstract.h b/source/blender/io/usd/intern/usd_writer_abstract.h index 9c8422b52f1..cf0f7e9d437 100644 --- a/source/blender/io/usd/intern/usd_writer_abstract.h +++ b/source/blender/io/usd/intern/usd_writer_abstract.h @@ -56,7 +56,7 @@ class USDAbstractWriter : public AbstractHierarchyWriter { /* Returns true if the data to be written is actually supported. This would, for example, allow a * hypothetical camera writer accept a perspective camera but reject an orthogonal one. * - * Returning false from a transform writer will prevent the object and all its decendants from + * Returning false from a transform writer will prevent the object and all its descendants from * being exported. Returning false from a data writer (object data, hair, or particles) will * only prevent that data from being written (and thus cause the object to be exported as an * Empty). */ diff --git a/source/blender/makesdna/DNA_layer_types.h b/source/blender/makesdna/DNA_layer_types.h index 62ae5768879..a9293d18d41 100644 --- a/source/blender/makesdna/DNA_layer_types.h +++ b/source/blender/makesdna/DNA_layer_types.h @@ -28,8 +28,10 @@ extern "C" { #include "DNA_freestyle_types.h" #include "DNA_listBase.h" -/* Renderpasses for EEVEE. - * ViewLayerEEVEE.render_passes */ +/** + * Render-passes for EEVEE. + * #ViewLayerEEVEE.render_passes + */ typedef enum eViewLayerEEVEEPassType { EEVEE_RENDER_PASS_COMBINED = (1 << 0), EEVEE_RENDER_PASS_Z = (1 << 1), diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index 3c05755159d..d8acf5bc493 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -134,9 +134,13 @@ typedef struct Mesh { struct MLoopCol *mloopcol; /* END BMESH ONLY */ - /* mface stores the tessellation (triangulation) of the mesh, - * real faces are now stored in nface.*/ - /** Array of mesh object mode faces for tessellation. */ + /** + * Legacy face storage (quads & tries only), + * faces are now stored in #Mesh.mpoly & #Mesh.mloop arrays. + * + * \note This would be marked deprecated however the particles still use this at run-time + * for placing particles on the mesh (something which should be eventually upgraded). + */ struct MFace *mface; /** Store tessellation face UV's and texture here. */ struct MTFace *mtface; diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c index 2e0fe6200d1..cf7c201795e 100644 --- a/source/blender/makesdna/intern/dna_genfile.c +++ b/source/blender/makesdna/intern/dna_genfile.c @@ -591,7 +591,7 @@ SDNA *DNA_sdna_from_data(const void *data, } /** - * Using globals is acceptable here, + * Using a global is acceptable here, * the data is read-only and only changes between Blender versions. * * So it is safe to create once and reuse. diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h index abbe284e97a..2a5d3890150 100644 --- a/source/blender/makesrna/RNA_types.h +++ b/source/blender/makesrna/RNA_types.h @@ -182,8 +182,8 @@ typedef enum PropertyFlag { */ PROP_ANIMATABLE = (1 << 1), /** - * This flag means when the property's widget is in 'textedit' mode, it will be updated - * after every typed char, instead of waiting final validation. Used e.g. for text searchbox. + * This flag means when the property's widget is in 'text-edit' mode, it will be updated + * after every typed char, instead of waiting final validation. Used e.g. for text search-box. * It will also cause UI_BUT_VALUE_CLEAR to be set for text buttons. We could add an own flag * for search/filter properties, but this works just fine for now. */ -- cgit v1.2.3