[Bf-blender-cvs] [deca7c79541] master: Cleanup: spelling
Campbell Barton
noreply at git.blender.org
Wed Oct 14 05:59:10 CEST 2020
Commit: deca7c795411975e3bfb11cd6934ace768be772b
Author: Campbell Barton
Date: Wed Oct 14 14:43:54 2020 +1100
Branches: master
https://developer.blender.org/rBdeca7c795411975e3bfb11cd6934ace768be772b
Cleanup: spelling
===================================================================
M source/blender/blenkernel/BKE_paint.h
M source/blender/blenkernel/intern/shrinkwrap.c
M source/blender/bmesh/intern/bmesh_construct.c
M source/blender/editors/screen/area.c
M source/blender/io/collada/MeshImporter.cpp
M source/blender/modifiers/intern/MOD_volume_displace.cc
M source/blender/simulation/intern/implicit_blender.c
M source/blender/simulation/intern/implicit_eigen.cpp
===================================================================
diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h
index 64910e5f1a9..614badb59f9 100644
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@ -270,12 +270,12 @@ typedef enum eSculptClothConstraintType {
/* Constraint that creates the structure of the cloth. */
SCULPT_CLOTH_CONSTRAINT_STRUCTURAL = 0,
/* Constraint that references the position of a vertex and a position in deformation_pos which
- can be deformed by the tools. */
+ * can be deformed by the tools. */
SCULPT_CLOTH_CONSTRAINT_DEFORMATION = 1,
- /* Constarint that references the vertex position and a editable softbody position for
- plasticity. */
+ /* Constraint that references the vertex position and a editable soft-body position for
+ * plasticity. */
SCULPT_CLOTH_CONSTRAINT_SOFTBODY = 2,
- /* Constarint that references the vertex position and its initial position. */
+ /* Constraint that references the vertex position and its initial position. */
SCULPT_CLOTH_CONSTRAINT_PIN = 3,
} eSculptClothConstraintType;
@@ -295,7 +295,7 @@ typedef struct SculptClothLengthConstraint {
float length;
float strength;
- /* Index in SculptClothSimulation.node_state of the node from where this constraint was created.
+ /* Index in #SculptClothSimulation.node_state of the node from where this constraint was created.
* This constraints will only be used by the solver if the state is active. */
int node;
@@ -329,7 +329,7 @@ typedef struct SculptClothSimulation {
struct ListBase *collider_list;
int totnode;
- /* PBVHNode pointer as a key, index in SculptClothSimulation.node_state as value. */
+ /** #PBVHNode pointer as a key, index in #SculptClothSimulation.node_state as value. */
struct GHash *node_state_index;
eSculptClothNodeSimState *node_state;
} SculptClothSimulation;
@@ -341,7 +341,7 @@ typedef struct SculptPersistentBase {
} SculptPersistentBase;
typedef struct SculptVertexInfo {
- /* Idexed by vertex, stores and ID of its topologycally connected component. */
+ /* Indexed by vertex, stores and ID of its topologically connected component. */
int *connected_component;
/* Indexed by base mesh vertex index, stores if that vertex is a boundary. */
@@ -429,7 +429,7 @@ typedef struct SculptFakeNeighbors {
/* Max distance used to calculate neighborhood information. */
float current_max_distance;
- /* Idexed by vertex, stores the vertex index of its fake neighbor if available. */
+ /* Indexed by vertex, stores the vertex index of its fake neighbor if available. */
int *fake_neighbor_index;
} SculptFakeNeighbors;
diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c
index e9cf6421a02..96f2b8c1095 100644
--- a/source/blender/blenkernel/intern/shrinkwrap.c
+++ b/source/blender/blenkernel/intern/shrinkwrap.c
@@ -345,10 +345,10 @@ void BKE_shrinkwrap_compute_boundary_data(struct Mesh *mesh)
mesh->runtime.shrinkwrap_data = shrinkwrap_build_boundary_data(mesh);
}
-/*
- * Shrinkwrap to the nearest vertex
+/**
+ * Shrink-wrap to the nearest vertex
*
- * it builds a kdtree of vertexs we can attach to and then
+ * it builds a #BVHTree of vertices we can attach to and then
* for each vertex performs a nearest vertex search on the tree
*/
static void shrinkwrap_calc_nearest_vertex_cb_ex(void *__restrict userdata,
diff --git a/source/blender/bmesh/intern/bmesh_construct.c b/source/blender/bmesh/intern/bmesh_construct.c
index 757ab735134..4c70be65bef 100644
--- a/source/blender/bmesh/intern/bmesh_construct.c
+++ b/source/blender/bmesh/intern/bmesh_construct.c
@@ -612,8 +612,8 @@ void BM_mesh_copy_init_customdata(BMesh *bm_dst, BMesh *bm_src, const BMAllocTem
*
* \param bm_dst: BMesh whose custom-data layers will be added.
* \param bm_src: BMesh whose custom-data layers will be copied.
- * \param htype: Specifies which custom-datas will be initiated.
- * \param allocsize: Estimated number of elements to init the mempool.
+ * \param htype: Specifies which custom-data layers will be initiated.
+ * \param allocsize: Initialize the the memory-pool before use (may be an estimate).
*/
void BM_mesh_copy_init_customdata_all_layers(BMesh *bm_dst,
BMesh *bm_src,
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index fd94eea337f..6399778f62b 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -3116,7 +3116,7 @@ static bool panel_property_search(const bContext *C,
UI_block_layout_free(block);
- /* We could check after each layout to increase the likelyhood of returning early,
+ /* We could check after each layout to increase the likelihood of returning early,
* but that probably wouldn't make much of a difference anyway. */
if (UI_block_apply_search_filter(block, search_filter)) {
return true;
diff --git a/source/blender/io/collada/MeshImporter.cpp b/source/blender/io/collada/MeshImporter.cpp
index b0e3270a899..7d5cd671b73 100644
--- a/source/blender/io/collada/MeshImporter.cpp
+++ b/source/blender/io/collada/MeshImporter.cpp
@@ -422,8 +422,8 @@ static std::string extract_vcolname(const COLLADAFW::String &collada_id)
/* =================================================================
* Return the number of faces by summing up
- * the facecounts of the parts.
- * hint: This is done because mesh->getFacesCount() does
+ * the face-counts of the parts.
+ * hint: This is done because `mesh->getFacesCount()` does
* count loose edges as extra faces, which is not what we want here.
* ================================================================= */
void MeshImporter::allocate_poly_data(COLLADAFW::Mesh *collada_mesh, Mesh *me)
@@ -674,7 +674,7 @@ void MeshImporter::read_polys(COLLADAFW::Mesh *collada_mesh, Mesh *me)
Primitive prim = {mpoly, 0};
/* If MeshPrimitive is TRIANGLE_FANS we split it into triangles
- * The first trifan vertex will be the first vertex in every triangle
+ * The first triangle-fan vertex will be the first vertex in every triangle
* XXX The proper function of TRIANGLE_FANS is not tested!!!
* XXX In particular the handling of the normal_indices looks very wrong to me */
if (collada_meshtype == COLLADAFW::MeshPrimitive::TRIANGLE_FANS) {
diff --git a/source/blender/modifiers/intern/MOD_volume_displace.cc b/source/blender/modifiers/intern/MOD_volume_displace.cc
index f26aa729f3b..18ecefda881 100644
--- a/source/blender/modifiers/intern/MOD_volume_displace.cc
+++ b/source/blender/modifiers/intern/MOD_volume_displace.cc
@@ -136,8 +136,8 @@ static void panelRegister(ARegionType *region_type)
static openvdb::Mat4s matrix_to_openvdb(const float m[4][4])
{
- /* Openvdb matrices are transposed Blender matrices, i.e. the translation is in the last row
- * instead of in the last column. However, the layout in memory is the same, because openvdb
+ /* OpenVDB matrices are transposed Blender matrices, i.e. the translation is in the last row
+ * instead of in the last column. However, the layout in memory is the same, because OpenVDB
* matrices are row major (compared to Blender's column major matrices). */
openvdb::Mat4s new_matrix{reinterpret_cast<const float *>(m)};
return new_matrix;
diff --git a/source/blender/simulation/intern/implicit_blender.c b/source/blender/simulation/intern/implicit_blender.c
index 9bfe77d5e60..df8c4782acd 100644
--- a/source/blender/simulation/intern/implicit_blender.c
+++ b/source/blender/simulation/intern/implicit_blender.c
@@ -1740,7 +1740,7 @@ BLI_INLINE float fbstar_jacobi(float length, float L, float kb, float cb)
return -kb * fbderiv(length, L);
}
-/* calculate elonglation */
+/* calculate elongation */
BLI_INLINE bool spring_length(Implicit_Data *data,
int i,
int j,
@@ -1810,7 +1810,7 @@ bool SIM_mass_spring_force_spring_linear(Implicit_Data *data,
float f[3], dfdx[3][3], dfdv[3][3];
float damping = 0;
- /* calculate elonglation */
+ /* calculate elongation */
spring_length(data, i, j, extent, dir, &length, vel);
/* This code computes not only the force, but also its derivative.
@@ -1860,7 +1860,7 @@ bool SIM_mass_spring_force_spring_bending(
{
float extent[3], length, dir[3], vel[3];
- /* calculate elonglation */
+ /* calculate elongation */
spring_length(data, i, j, extent, dir, &length, vel);
if (length < restlen) {
diff --git a/source/blender/simulation/intern/implicit_eigen.cpp b/source/blender/simulation/intern/implicit_eigen.cpp
index 75103452471..b30a46909b9 100644
--- a/source/blender/simulation/intern/implicit_eigen.cpp
+++ b/source/blender/simulation/intern/implicit_eigen.cpp
@@ -950,7 +950,7 @@ BLI_INLINE float fbstar_jacobi(float length, float L, float kb, float cb)
}
}
-/* calculate elonglation */
+/* calculate elongation */
BLI_INLINE bool spring_length(Implicit_Data *data,
int i,
int j,
@@ -1014,7 +1014,7 @@ bool SIM_mass_spring_force_spring_linear(Implicit_Data *data,
{
float extent[3], length, dir[3], vel[3];
- /* calculate elonglation */
+ /* calculate elongation */
spring_length(data, i, j, extent, dir, &length, vel);
if (length > restlen || no_compress) {
@@ -1026,7 +1026,7 @@ bool SIM_mass_spring_force_spring_linear(Implicit_Data *data,
}
mul_v3_v3fl(f, dir, stretch_force);
- /* Ascher & Boxman, p.21: Damping only during elonglation
+ /* Ascher & Boxman, p.21: Damping only during elongation
* something wrong with it... */
madd_v3_v3fl(f, dir, damping * dot_v3v3(vel, dir));
@@ -1075,7 +1075,7 @@ bool SIM_mass_spring_force_spring_bending(Implicit_Data *data,
{
float extent[3], length, dir[3], vel[3];
- /* calculate elonglation */
+ /* calculate elongation */
spring_length(data, i, j, extent, dir, &length, vel);
if (length < restlen) {
@@ -1468,7 +1468,7 @@ bool SIM_mass_spring_force_spring_goal(Implicit_Data *data,
if (length > ALMOST_ZERO) {
mul_v3_v3fl(f, dir, stiffnes
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list