Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2020-08-29 06:41:02 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-08-29 11:56:08 +0300
commit014276a11cd24825ca9d3ea2e21682a5557d38da (patch)
treee4a7615b5a396fd0aaff0a9810aae5bae410f892
parentbfa78aceed7824e5a5cfcefe6d73d96dc12b0d99 (diff)
Cleanup: spelling
-rw-r--r--source/blender/blenkernel/intern/constraint.c2
-rw-r--r--source/blender/blenkernel/intern/curve.c5
-rw-r--r--source/blender/blenkernel/intern/lib_id.c2
-rw-r--r--source/blender/blenkernel/intern/lib_override.c12
-rw-r--r--source/blender/blenkernel/intern/softbody.c2
-rw-r--r--source/blender/blenlib/BLI_mesh_boolean.hh14
-rw-r--r--source/blender/blenlib/intern/math_boolean.cc6
-rw-r--r--source/blender/blenlib/intern/mesh_boolean.cc4
-rw-r--r--source/blender/blentranslation/intern/blt_lang.c21
9 files changed, 36 insertions, 32 deletions
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index e5a9ee53054..ee386b3403b 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -971,7 +971,7 @@ static void childof_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *tar
}
/* Multiply together the target (parent) matrix, parent inverse,
- * and the owner transform matrixto get the effect of this constraint
+ * and the owner transform matrix to get the effect of this constraint
* (i.e. owner is 'parented' to parent). */
float orig_cob_matrix[4][4];
copy_m4_m4(orig_cob_matrix, cob->matrix);
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index 44d5bbfd710..4d6b8feea26 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -3321,8 +3321,9 @@ static void calchandlesNurb_intern(Nurb *nu, eBezTriple_Flag handle_sel_flag, bo
}
}
-/* A utility function for allocating a number of arrays of the same length
- * with easy error checking and deallocation, and an easy way to add or remove
+/**
+ * A utility function for allocating a number of arrays of the same length
+ * with easy error checking and de-allocation, and an easy way to add or remove
* arrays that are processed in this way when changing code.
*
* floats, chars: NULL-terminated arrays of pointers to array pointers that need to be allocated.
diff --git a/source/blender/blenkernel/intern/lib_id.c b/source/blender/blenkernel/intern/lib_id.c
index dfe939aa878..f8f171bd9d7 100644
--- a/source/blender/blenkernel/intern/lib_id.c
+++ b/source/blender/blenkernel/intern/lib_id.c
@@ -339,7 +339,7 @@ static int lib_id_expand_local_cb(LibraryIDLinkCallbackData *cb_data)
int const cb_flag = cb_data->cb_flag;
if (cb_flag & IDWALK_CB_LOOPBACK) {
- /* We should never have anything to do with loopback pointers here. */
+ /* We should never have anything to do with loop-back pointers here. */
return IDWALK_RET_NOP;
}
diff --git a/source/blender/blenkernel/intern/lib_override.c b/source/blender/blenkernel/intern/lib_override.c
index e9244c5af73..2908ef133f0 100644
--- a/source/blender/blenkernel/intern/lib_override.c
+++ b/source/blender/blenkernel/intern/lib_override.c
@@ -1281,7 +1281,7 @@ bool BKE_lib_override_library_operations_create(Main *bmain, ID *local)
if (!is_template) {
/* Do not attempt to generate overriding rules from an empty place-holder generated by link
- * code when it cannot find to actual library/ID. Much better to keep the local datablock as
+ * code when it cannot find to actual library/ID. Much better to keep the local data-block as
* is in the file in that case, until broken lib is fixed. */
if (ID_MISSING(local->override_library->reference)) {
return ret;
@@ -1605,7 +1605,7 @@ void BKE_lib_override_library_update(Main *bmain, ID *local)
}
/* Do not attempt to apply overriding rules over an empty place-holder generated by link code
- * when it cannot find to actual library/ID. Much better to keep the local datablock as loaded
+ * when it cannot find to actual library/ID. Much better to keep the local data-block as loaded
* from the file in that case, until broken lib is fixed. */
if (ID_MISSING(local->override_library->reference)) {
return;
@@ -1645,7 +1645,7 @@ void BKE_lib_override_library_update(Main *bmain, ID *local)
* manual handling here. */
BLI_strncpy(tmp_id->name, local->name, sizeof(tmp_id->name));
- /* Those ugly loopback pointers again... Luckily we only need to deal with the shape keys here,
+ /* Those ugly loop-back pointers again... Luckily we only need to deal with the shape keys here,
* collections' parents are fully runtime and reconstructed later. */
Key *local_key = BKE_key_from_id(local);
Key *tmp_key = BKE_key_from_id(tmp_id);
@@ -1686,8 +1686,8 @@ void BKE_lib_override_library_update(Main *bmain, ID *local)
BKE_id_free_ex(bmain, tmp_id, LIB_ID_FREE_NO_UI_USER, true);
if (GS(local->name) == ID_AR) {
- /* Funtime again, thanks to bone pointers in pose data of objects. We keep same ID addresses,
- * but internal data has changed for sure, so we need to invalidate posebones caches. */
+ /* Fun times again, thanks to bone pointers in pose data of objects. We keep same ID addresses,
+ * but internal data has changed for sure, so we need to invalidate pose-bones caches. */
LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
if (ob->pose != NULL && ob->data == local) {
BLI_assert(ob->type == OB_ARMATURE);
@@ -1700,7 +1700,7 @@ void BKE_lib_override_library_update(Main *bmain, ID *local)
}
if (local->override_library->storage) {
- /* We know this datablock is not used anywhere besides local->override->storage. */
+ /* We know this data-block is not used anywhere besides local->override->storage. */
/* XXX For until we get fully shadow copies, we still need to ensure storage releases
* its usage of any ID pointers it may have. */
BKE_id_free_ex(bmain, local->override_library->storage, LIB_ID_FREE_NO_UI_USER, true);
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c
index 6a6f74d9fb4..4d3e8b55404 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -955,7 +955,7 @@ static void free_softbody_intern(SoftBody *sb)
* (only needs the current particle position)
*
* it actually checks if the particle intrudes a short range force field generated
- * by the faces of the target object and returns a force to drive the particel out
+ * by the faces of the target object and returns a force to drive the particle out
* the strength of the field grows exponentially if the particle is on the 'wrong' side of the face
* 'wrong' side : projection to the face normal is negative (all referred to a vertex in the face)
*
diff --git a/source/blender/blenlib/BLI_mesh_boolean.hh b/source/blender/blenlib/BLI_mesh_boolean.hh
index 693639f20f2..cb6fc203dc7 100644
--- a/source/blender/blenlib/BLI_mesh_boolean.hh
+++ b/source/blender/blenlib/BLI_mesh_boolean.hh
@@ -41,17 +41,17 @@ enum class BoolOpType {
/**
* Do the boolean operation op on the mesh pm_in.
- * The boolean operation has nshapes input shapes. Each is a disjoint subset of the input mesh.
+ * The boolean operation has \a nshapes input shapes. Each is a disjoint subset of the input mesh.
* The shape_fn argument, when applied to an input face argument, says which shape it is in
- * (should be a value from -1 to nshapes - 1: if -1, it is not part of any shape).
- * The use_self arg says whether or not the function should assume that faces in the
+ * (should be a value from -1 to `nshapes - 1`: if -1, it is not part of any shape).
+ * The use_self argument says whether or not the function should assume that faces in the
* same shape intersect - if the argument is true, such self-intersections will be found.
* Sometimes the caller has already done a triangulation of the faces,
* and if so, *pm_triangulated contains a triangulation: if non-null, it contains a mesh
* of triangles, each of whose orig_field says which face in pm that triangle belongs to.
- * pm arg isn't const because we may populate its verts (for debugging).
- * Same goes for the pm_triangulated arg.
- * The output IMesh will have faces whose orig fields map back to faces and edges in
+ * pm argument isn't `const` because we may populate its verts (for debugging).
+ * Same goes for the pm_triangulated argument.
+ * The output #IMesh will have faces whose orig fields map back to faces and edges in
* the input mesh.
*/
IMesh boolean_mesh(IMesh &imesh,
@@ -63,7 +63,7 @@ IMesh boolean_mesh(IMesh &imesh,
IMeshArena *arena);
/**
- * This is like boolean, but operates on IMesh's whose faces are all triangles.
+ * This is like boolean, but operates on #IMesh's whose faces are all triangles.
* It is exposed mainly for unit testing, at the moment: boolean_mesh() uses
* it to do most of its work.
*/
diff --git a/source/blender/blenlib/intern/math_boolean.cc b/source/blender/blenlib/intern/math_boolean.cc
index 22b4ff81db4..0c3b4ab8395 100644
--- a/source/blender/blenlib/intern/math_boolean.cc
+++ b/source/blender/blenlib/intern/math_boolean.cc
@@ -437,8 +437,8 @@ static double isperrboundA, isperrboundB, isperrboundC;
* floating-point arithmetic. `epsilon' bounds the relative round-off
* error. It is used for floating-point error analysis.
*
- * `splitter' is used to split floating-point numbers into two half-
- * length significands for exact multiplication.
+ * `splitter' is used to split floating-point numbers into two half-length
+ * significant for exact multiplication.
*
* I imagine that a highly optimizing compiler might be too smart for its
* own good, and somehow cause this routine to fail, if it pretends that
@@ -768,7 +768,7 @@ double orient2d(const double *pa, const double *pb, const double *pc)
}
/**
- * orient3dfast() Approximate 3D orientation test. Nonrobust.
+ * orient3dfast() Approximate 3D orientation test. Non-robust.
* orient3d() Adaptive exact 3D orientation test. Robust.
*
* Return a positive value if the point pd lies below the
diff --git a/source/blender/blenlib/intern/mesh_boolean.cc b/source/blender/blenlib/intern/mesh_boolean.cc
index bb8b14ebdc6..387d879c5af 100644
--- a/source/blender/blenlib/intern/mesh_boolean.cc
+++ b/source/blender/blenlib/intern/mesh_boolean.cc
@@ -1489,7 +1489,7 @@ static Edge find_good_sorting_edge(const Vert *testp,
std::cout << "FIND_GOOD_SORTING_EDGE testp = " << testp << ", closestp = " << closestp << "\n";
}
/* We want to project the edges incident to closestp onto a plane
- * whose ordinate direction will be regarded as going from closetp to testp,
+ * whose ordinate direction will be regarded as going from closestp to testp,
* and whose abscissa direction is some perpendicular to that.
* A perpendicular direction can be found by swapping two coordinates
* and negating one, and zeroing out the third, being careful that one
@@ -2560,7 +2560,7 @@ static Array<Face *> triangulate_poly(Face *f, IMeshArena *arena)
/**
* Return an #IMesh that is a triangulation of a mesh with general
- * polygonal faces, #imesh.
+ * polygonal faces, #IMesh.
* Added diagonals will be distinguishable by having edge original
* indices of #NO_INDEX.
*/
diff --git a/source/blender/blentranslation/intern/blt_lang.c b/source/blender/blentranslation/intern/blt_lang.c
index bcbffe56636..078ded7e5c2 100644
--- a/source/blender/blentranslation/intern/blt_lang.c
+++ b/source/blender/blentranslation/intern/blt_lang.c
@@ -205,11 +205,11 @@ void BLT_lang_init(void)
const char *const messagepath = BKE_appdir_folder_id(BLENDER_DATAFILES, "locale");
#endif
- /* Make sure LANG is correct and wouldn't cause std::rumtime_error. */
+ /* Make sure LANG is correct and wouldn't cause #std::rumtime_error. */
#ifndef _WIN32
/* TODO(sergey): This code only ensures LANG is set properly, so later when
- * Cycles will try to use file system API from boost there'll be no runtime
- * exception generated by std::locale() which _requires_ having proper LANG
+ * Cycles will try to use file system API from boost there will be no runtime
+ * exception generated by #std::locale() which _requires_ having proper LANG
* set in the environment.
*
* Ideally we also need to ensure LC_ALL, LC_MESSAGES and others are also
@@ -221,7 +221,7 @@ void BLT_lang_init(void)
const char *lang = BLI_getenv("LANG");
if (lang != NULL) {
char *old_locale = setlocale(LC_ALL, NULL);
- /* Make a copy so subsequenct setlocale() doesn't interfere. */
+ /* Make a copy so subsequent #setlocale() doesn't interfere. */
old_locale = BLI_strdup(old_locale);
if (setlocale(LC_ALL, lang) == NULL) {
setenv("LANG", "C", 1);
@@ -267,7 +267,7 @@ void BLT_lang_set(const char *str)
/* We want to avoid locales like '.UTF-8'! */
if (short_locale[0]) {
- /* Hurrey! encoding needs to be placed *before* variant! */
+ /* Hooray! Encoding needs to be placed *before* variant! */
char *variant = strchr(short_locale, '@');
if (variant) {
char *locale = BLI_strdupn(short_locale, variant - short_locale);
@@ -311,12 +311,14 @@ const char *BLT_lang_get(void)
#undef LOCALE
#undef ULANGUAGE
-/* Get locale's elements (if relevant pointer is not NULL and element actually exists, e.g.
+/**
+ * Get locale's elements (if relevant pointer is not NULL and element actually exists, e.g.
* if there is no variant,
* *variant and *language_variant will always be NULL).
* Non-null elements are always MEM_mallocN'ed, it's the caller's responsibility to free them.
- * NOTE: Keep that one always available, you never know,
- * may become useful even in no-WITH_INTERNATIONAL context...
+ *
+ * \note Keep that one always available, you never know,
+ * may become useful even in no #WITH_INTERNATIONAL context.
*/
void BLT_lang_locale_explode(const char *locale,
char **language,
@@ -378,7 +380,8 @@ void BLT_lang_locale_explode(const char *locale,
}
}
-/* Test if the translation context allows IME input - used to
+/**
+ * Test if the translation context allows IME input - used to
* avoid weird character drawing if IME inputs non-ascii chars.
*/
static void blt_lang_check_ime_supported(void)