[Bf-blender-cvs] [a1ef2e4b16e] master: Cleanup: comment, RNA spelling
Campbell Barton
noreply at git.blender.org
Mon Jun 17 04:53:10 CEST 2019
Commit: a1ef2e4b16e1fe3c183e7477649f866b3e814102
Author: Campbell Barton
Date: Mon Jun 17 12:51:53 2019 +1000
Branches: master
https://developer.blender.org/rBa1ef2e4b16e1fe3c183e7477649f866b3e814102
Cleanup: comment, RNA spelling
===================================================================
M intern/cycles/blender/blender_mesh.cpp
M intern/opensubdiv/internal/opensubdiv_edge_map.h
M intern/opensubdiv/internal/opensubdiv_topology_refiner.cc
M source/blender/blenkernel/BKE_subdiv.h
M source/blender/blenkernel/BKE_subdiv_eval.h
M source/blender/blenkernel/BKE_subdiv_foreach.h
M source/blender/blenkernel/intern/constraint.c
M source/blender/blenkernel/intern/movieclip.c
M source/blender/blenkernel/intern/multires_reshape.c
M source/blender/blenkernel/intern/sound.c
M source/blender/blenkernel/intern/subdiv_mesh.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_250.c
M source/blender/blenloader/intern/versioning_defaults.c
M source/blender/collada/collada_utils.h
M source/blender/depsgraph/DEG_depsgraph_build.h
M source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M source/blender/makesdna/DNA_particle_types.h
M source/blender/makesrna/intern/rna_userdef.c
===================================================================
diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp
index 2a5c163aaeb..c672bc9f3e2 100644
--- a/intern/cycles/blender/blender_mesh.cpp
+++ b/intern/cycles/blender/blender_mesh.cpp
@@ -1133,7 +1133,7 @@ void BlenderSync::sync_mesh_motion(BL::Depsgraph &b_depsgraph,
return;
}
- /* TODO(sergey): Perform preliminary check for number of verticies. */
+ /* TODO(sergey): Perform preliminary check for number of vertices. */
if (numverts) {
/* Find attributes. */
Attribute *attr_mP = mesh->attributes.find(ATTR_STD_MOTION_VERTEX_POSITION);
diff --git a/intern/opensubdiv/internal/opensubdiv_edge_map.h b/intern/opensubdiv/internal/opensubdiv_edge_map.h
index 661b8a10eda..e2e6d2328fe 100644
--- a/intern/opensubdiv/internal/opensubdiv_edge_map.h
+++ b/intern/opensubdiv/internal/opensubdiv_edge_map.h
@@ -38,7 +38,7 @@ class EdgeKey {
int v2;
};
-// Map from an edge defined by its verticies index to a custom tag value.
+// Map from an edge defined by its vertices index to a custom tag value.
template<typename T> class EdgeTagMap {
public:
typedef EdgeKey key_type;
diff --git a/intern/opensubdiv/internal/opensubdiv_topology_refiner.cc b/intern/opensubdiv/internal/opensubdiv_topology_refiner.cc
index 69907da8a8c..f4a1a82ca52 100644
--- a/intern/opensubdiv/internal/opensubdiv_topology_refiner.cc
+++ b/intern/opensubdiv/internal/opensubdiv_topology_refiner.cc
@@ -378,7 +378,7 @@ bool compareCyclicBackward(const CyclicArray &array_a,
return true;
}
-// Utility function dedicated for checking whether whether verticies indices
+// Utility function dedicated for checking whether whether vertices indices
// used by two faces match.
// The tricky part here is that we can't trust 1:1 array match here, since it's
// possible that OpenSubdiv oriented edges of a face to make it compatible with
@@ -386,7 +386,7 @@ bool compareCyclicBackward(const CyclicArray &array_a,
//
// TODO(sergey): Check whether this is needed, ot whether OpenSubdiv is only
// creating edges in a proper orientation without modifying indices of face
-// verticies.
+// vertices.
bool checkVerticesOfFacesMatch(const CyclicArray &indices_a, const CyclicArray &indices_b)
{
if (indices_a.size() != indices_a.size()) {
@@ -503,7 +503,7 @@ bool checkEdgeTagsMatchAutoOrient(const OpenSubdiv::Far::TopologyRefiner *topolo
using OpenSubdiv::Far::TopologyLevel;
const TopologyLevel &base_level = topology_refiner->GetLevel(0);
const int num_edges = base_level.GetNumEdges();
- // Create mapping for quick lookup of edge index from its verticies indices.
+ // Create mapping for quick lookup of edge index from its vertices indices.
//
// TODO(sergey): Consider caching it in some sort of wrapper around topology
// refiner.
@@ -514,7 +514,7 @@ bool checkEdgeTagsMatchAutoOrient(const OpenSubdiv::Far::TopologyRefiner *topolo
}
// Compare all edges.
for (int converter_edge_index = 0; converter_edge_index < num_edges; ++converter_edge_index) {
- // Get edge verticies indices, and lookup corresponding edge index in the
+ // Get edge vertices indices, and lookup corresponding edge index in the
// base topology level.
int edge_vertices[2];
converter->getEdgeVertices(converter, converter_edge_index, edge_vertices);
@@ -546,7 +546,7 @@ bool checkvertexSharpnessMatch(const OpenSubdiv::Far::TopologyRefiner *topology_
using OpenSubdiv::Far::TopologyLevel;
using OpenSubdiv::Sdc::Crease;
const TopologyLevel &base_level = topology_refiner->GetLevel(0);
- // Create mapping for quick lookup of edge index from its verticies indices.
+ // Create mapping for quick lookup of edge index from its vertices indices.
//
// TODO(sergey): Consider caching it in some sort of wrapper around topology
// refiner.
diff --git a/source/blender/blenkernel/BKE_subdiv.h b/source/blender/blenkernel/BKE_subdiv.h
index 781c036d222..dd139233ee3 100644
--- a/source/blender/blenkernel/BKE_subdiv.h
+++ b/source/blender/blenkernel/BKE_subdiv.h
@@ -107,7 +107,7 @@ typedef struct SubdivStats {
double begin_timestamp_[NUM_SUBDIV_STATS_VALUES];
} SubdivStats;
-/* Functor which evaluates dispalcement at a given (u, v) of given ptex face. */
+/* Functor which evaluates displacement at a given (u, v) of given ptex face. */
typedef struct SubdivDisplacement {
/* Initialize displacement evaluator.
*
@@ -205,7 +205,7 @@ Subdiv *BKE_subdiv_new_from_mesh(const SubdivSettings *settings, const struct Me
* new one is created from scratch.
*
* NOTE: It is allowed to pass NULL as an existing subdivision surface
- * descriptor. This will create enw descriptor without any extra checks.
+ * descriptor. This will create a new descriptor without any extra checks.
*/
Subdiv *BKE_subdiv_update_from_converter(Subdiv *subdiv,
const SubdivSettings *settings,
diff --git a/source/blender/blenkernel/BKE_subdiv_eval.h b/source/blender/blenkernel/BKE_subdiv_eval.h
index f8b8a25bfb6..1d794e4d61a 100644
--- a/source/blender/blenkernel/BKE_subdiv_eval.h
+++ b/source/blender/blenkernel/BKE_subdiv_eval.h
@@ -73,8 +73,8 @@ void BKE_subdiv_eval_face_varying(struct Subdiv *subdiv,
/* NOTE: Expects derivatives to be correct.
*
* TODO(sergey): This is currently used together with
- * BKE_subdiv_eval_final_point() which cas easily evaluate derivatives.
- * Would be nice to have dispalcement evaluation function which does not require
+ * BKE_subdiv_eval_final_point() which can easily evaluate derivatives.
+ * Would be nice to have displacement evaluation function which does not require
* knowing derivatives ahead of a time. */
void BKE_subdiv_eval_displacement(struct Subdiv *subdiv,
const int ptex_face_index,
diff --git a/source/blender/blenkernel/BKE_subdiv_foreach.h b/source/blender/blenkernel/BKE_subdiv_foreach.h
index 5de4edf40df..d9e0678670e 100644
--- a/source/blender/blenkernel/BKE_subdiv_foreach.h
+++ b/source/blender/blenkernel/BKE_subdiv_foreach.h
@@ -116,8 +116,8 @@ typedef struct SubdivForeachContext {
SubdivForeachVertexFromCornerCb vertex_every_corner;
SubdivForeachVertexFromEdgeCb vertex_every_edge;
/* Those callbacks are run once per subdivision vertex, ptex is undefined
- * as in it will be whatever first ptex face happened to be tarversed in
- * the multi-threaded environment ahd which shares "emitting" vertex or
+ * as in it will be whatever first ptex face happened to be traversed in
+ * the multi-threaded environment and which shares "emitting" vertex or
* edge.
*/
SubdivForeachVertexFromCornerCb vertex_corner;
@@ -159,7 +159,7 @@ typedef struct SubdivForeachContext {
* Returns truth if the whole topology was traversed, without any early exits.
*
* TODO(sergey): Need to either get rid of subdiv or of coarse_mesh.
- * The main point here is th be abel to get base level topology, which can be
+ * The main point here is to be able to get base level topology, which can be
* done with either of those. Having both of them is kind of redundant.
*/
bool BKE_subdiv_foreach_subdiv_geometry(struct Subdiv *subdiv,
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 4ae9b106e85..5766e84f960 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -2363,7 +2363,7 @@ static void armdef_accumulate_bone(bConstraintTarget *ct,
/* The target is a B-Bone:
* FIRST: find the segment (see b_bone_deform in armature.c)
- * Need to transform co back to bonespace, only need y. */
+ * Need to transform co back to bone-space, only need y. */
float y = iamat[0][1] * co[0] + iamat[1][1] * co[1] + iamat[2][1] * co[2] + iamat[3][1];
/* Blend the matrix. */
@@ -5238,14 +5238,16 @@ static void con_extern_cb(bConstraint *UNUSED(con),
}
}
-/* helper for BKE_constraints_copy(),
- * to be used for making sure that usercounts of copied ID's are fixed up */
+/**
+ * Helper for #BKE_constraints_copy(),
+ * to be used for making sure that user-counts of copied ID's are fixed up.
+ */
static void con_fix_copied_refs_cb(bConstraint *UNUSED(con),
ID **idpoin,
bool is_reference,
void *UNUSED(userData))
{
- /* increment usercount if this is a reference type */
+ /* Increment user-count if this is a reference type. */
if ((*idpoin) && (is_reference)) {
id_us_plus(*idpoin);
}
diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c
index 6f5eb69e80f..c377223d14b 100644
--- a/source/blender/blenkernel/intern/movieclip.c
+++ b/source/blender/blenkernel/intern/movieclip.c
@@ -148,9 +148,8 @@ static void get_sequence_fname(const MovieClip *clip, const int framenr, char *n
BLI_strncpy(name, clip->name, sizeof(clip->name));
BLI_stringdec(name, head, tail, &numlen);
- /* movieclips always points to first image from sequence,
- * autoguess offset for now. could be something smarter in the future
- */
+ /* Movie-clips always points to first image from sequence, auto-guess offset for now.
+ * Could be something smarter in the future. */
offset = sequence_guess_offset(clip->name, strlen(head), numlen);
if (numlen) {
diff --git a/source/blender/blenkernel/intern/multires_reshape.c b/source/blender/blenkernel/intern/multires_reshape.c
index 2af55b1b0bc..749cedb5388 100644
--- a/source/blender/blenkernel/intern/multires_reshape.c
+++ b/source/blender/blenkernel/intern/multires_reshape.c
@@ -812,7 +812,7 @@ static bool multires_reshape_from_vertcos(struct Depsgraph *depsgraph,
Scene *scene_eval = DEG_get_evaluated_scene(depsgraph);
Mesh *coarse_mesh = object->data;
MDisps *mdisps = CustomData_get_layer(&coarse_mesh->ldata, CD_MDISPS);
- /* Pick maximum between multires level and dispalcement level.
+ /* Pick maximum between multires level and displacement level.
* This is because mesh can be used by objects with multires at different
* levels.
*
@@ -1017,7 +1017,7 @@ bool multiresM
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list