diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-06-17 05:51:53 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-06-17 05:52:20 +0300 |
commit | a1ef2e4b16e1fe3c183e7477649f866b3e814102 (patch) | |
tree | 701f1696694488a780989cec0efb5063068b181e /source/blender/blenkernel | |
parent | 12da679fa094bdee5e0d55bac51a95a7abfc6d13 (diff) |
Cleanup: comment, RNA spelling
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_subdiv.h | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_subdiv_eval.h | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_subdiv_foreach.h | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/constraint.c | 10 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/movieclip.c | 5 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/multires_reshape.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/sound.c | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/subdiv_mesh.c | 10 |
8 files changed, 24 insertions, 22 deletions
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 multiresModifier_reshapeFromCCG(const int tot_level, Mesh *coarse_mesh, Sub } GridPaintMask *grid_paint_mask = CustomData_get_layer(&coarse_mesh->ldata, CD_GRID_PAINT_MASK); Subdiv *subdiv = subdiv_ccg->subdiv; - /* 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. * diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index 038fc603364..007614b4b95 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -83,7 +83,8 @@ BLI_INLINE void sound_verify_evaluated_id(ID *id) * Additionally, we also allow data-blocks outside of main database. Those can not be "original" * and could be used as a temporary evaluated result during operations like baking. * - * NOTE: We conder ID evaluated if ANY of those flags is set. We do NOT require ALL of them. */ + * NOTE: We consider ID evaluated if ANY of those flags is set. We do NOT require ALL of them. + */ BLI_assert(id->tag & (LIB_TAG_COPIED_ON_WRITE | LIB_TAG_COPIED_ON_WRITE_EVAL_RESULT | LIB_TAG_NO_MAIN)); } diff --git a/source/blender/blenkernel/intern/subdiv_mesh.c b/source/blender/blenkernel/intern/subdiv_mesh.c index 885898d9a57..947f51b4ff9 100644 --- a/source/blender/blenkernel/intern/subdiv_mesh.c +++ b/source/blender/blenkernel/intern/subdiv_mesh.c @@ -63,7 +63,7 @@ typedef struct SubdivMeshContext { * Averaging is happening for vertices along the coarse edges and corners. * This is needed for both displacement and normals. * - * Displacement is being accumulated to a verticies coordinates, since those + * Displacement is being accumulated to a vertices coordinates, since those * are not needed during traversal of edge/corner vertices. * * For normals we are using dedicated array, since we can not use same @@ -169,7 +169,7 @@ static void loops_of_ptex_get(const SubdivMeshContext *ctx, typedef struct VerticesForInterpolation { /* This field points to a vertex data which is to be used for interpolation. * The idea is to avoid unnecessary allocations for regular faces, where - * we can simply use corner verticies. */ + * we can simply use corner vertices. */ const CustomData *vertex_data; /* Vertices data calculated for ptex corners. There are always 4 elements * in this custom data, aligned the following way: @@ -182,7 +182,7 @@ typedef struct VerticesForInterpolation { * Is allocated for non-regular faces (triangles and n-gons). */ CustomData vertex_data_storage; bool vertex_data_storage_allocated; - /* Infices within vertex_data to interpolate for. The indices are aligned + /* Indices within vertex_data to interpolate for. The indices are aligned * with uv coordinates in a similar way as indices in loop_data_storage. */ int vertex_indices[4]; } VerticesForInterpolation; @@ -302,7 +302,7 @@ static void vertex_interpolation_end(VerticesForInterpolation *vertex_interpolat typedef struct LoopsForInterpolation { /* This field points to a loop data which is to be used for interpolation. * The idea is to avoid unnecessary allocations for regular faces, where - * we can simply interpolate corner verticies. */ + * we can simply interpolate corner vertices. */ const CustomData *loop_data; /* Loops data calculated for ptex corners. There are always 4 elements * in this custom data, aligned the following way: @@ -1092,7 +1092,7 @@ static void setup_foreach_callbacks(const SubdivMeshContext *subdiv_context, memset(foreach_context, 0, sizeof(*foreach_context)); /* General information. */ foreach_context->topology_info = subdiv_mesh_topology_info; - /* Every boundary geometry. Used for dispalcement and normals averaging. */ + /* Every boundary geometry. Used for displacement and normals averaging. */ if (subdiv_context->can_evaluate_normals || subdiv_context->have_displacement) { foreach_context->vertex_every_corner = subdiv_mesh_vertex_every_corner; foreach_context->vertex_every_edge = subdiv_mesh_vertex_every_edge; |